From 919aedd3e84595a660e760a66661442dd3af8add Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 10 Jul 2024 16:03:03 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B=E9=83=A8=E9=97=A8=E8=81=94=E7=BB=9C?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=8B=E5=8F=91=E8=8A=82=E7=82=B9=E7=9A=84=E5=BE=81?=
 =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E8=A6=81=E6=97=A9=E4=BA=8E=E6=A0=87=E5=87=86=E5=8C=96=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=88=AA?=
 =?UTF-8?q?=E6=AD=A2=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ConfirmWhetherCommentBaseInfo.vue | 29 +++++++++++++++++++
 .../modules/DepartLiaisonIssueBaseInfo.vue    | 14 ++++++---
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/ConfirmWhetherCommentBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/ConfirmWhetherCommentBaseInfo.vue
index 4cbbf094..cc2826e0 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/ConfirmWhetherCommentBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/ConfirmWhetherCommentBaseInfo.vue
@@ -54,6 +54,23 @@
                                              type="checkbox"/>
           </a-form-model-item>
         </div>
+        <!--  征求意见计划截止日期  -->
+        <div v-if="formInline.adviceFlag === '1'" class="box-title-text form-flex-item">
+          <div class="title-text">
+            <span class="required">*</span>
+            <span class="title-text-text" :title="$t('workCenter.enStandardRevision.deadlineForComments')">
+                  {{ $t('workCenter.enStandardRevision.deadlineForComments') }}
+                </span>
+          </div>
+          <a-form-model-item class="item-model" prop="totalAdviceDeadline">
+            <a-date-picker
+              v-model="formInline.totalAdviceDeadline"
+              :showTime="false"
+              :disabled="disabled"
+              value-format="YYYY-MM-DD">
+            </a-date-picker>
+          </a-form-model-item>
+        </div>
       </div>
     </a-form-model>
   </div>
@@ -84,6 +101,14 @@ export default {
             message: this.$t('workCenter.enStandardRevision.departmentalLiaison') + this.$t('cannotEmpty'),
             trigger: 'change'
           }
+        ],
+        // 征求意见截止日期
+        totalAdviceDeadline: [
+          {
+            required: true,
+            message: this.$t('workCenter.enStandardRevision.deadlineForComments') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
         ]
       },
       onEditFile: '' // 在线编辑的文件id
@@ -159,4 +184,8 @@ export default {
     margin-right: 20px;
   }
 }
+
+/deep/ .ant-form-item-children > * {
+  width: 100%;
+}
 </style>
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue
index c4b46557..727b25cf 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue
@@ -28,6 +28,7 @@
           <a-form-model-item class="item-model" prop="adviceDeadline">
             <a-date-picker
               v-model="formInline.adviceDeadline"
+              :disabled-date="adviceDeadlineDisabledDate"
               :showTime="false"
               :disabled="disabled"
               value-format="YYYY-MM-DD">
@@ -122,10 +123,10 @@ export default {
       let data = {}
       await this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          // 有征求意见稿计划完成日期和征求意见截止日期，需要征求意见截止日期比计划完成日期早可以等于
-          // if (JSON.parse(this.formInline.businessJson).solicitationDraftPlanCompleteDate && this.formInline.adviceDeadline) {
-          //   console.log('征求意见稿计划完成日期', JSON.parse(this.formInline.businessJson).solicitationDraftPlanCompleteDate)
-          //   const planDate = new Date(Date.parse(JSON.parse(this.formInline.businessJson).solicitationDraftPlanCompleteDate))
+          // 有标准化确认是否开启征求意见节点的征求意见截止日期和征求意见截止日期，需要征求意见截止日期比标准化确认是否开启征求意见节点的征求意见截止日期早可以等于
+          // if (this.formInline.totalAdviceDeadline && this.formInline.adviceDeadline) {
+          //   console.log('征求意见稿计划完成日期', this.formInline.totalAdviceDeadline)
+          //   const planDate = new Date(Date.parse(this.formInline.totalAdviceDeadline))
           //   const deadlineDate = new Date(Date.parse(this.formInline.adviceDeadline))
           //   if (deadlineDate <= planDate) {
           //     // 截止日期比完成日期早
@@ -144,6 +145,11 @@ export default {
       })
       return data
     },
+    // 征求意见截止日期，不可选的日期，标准化设置的截止日期之前可选
+    adviceDeadlineDisabledDate (current) {
+      const totalAdviceDeadline = new Date(this.formInline.totalAdviceDeadline + ' 23:59:59')
+      return current && current > totalAdviceDeadline
+    },
     // 选择用户得到用户名
     userSelectNameChange (value, fieldName) {
       this.formInline[fieldName + '_dictText'] = value