浏览代码

feat开发i

xiaweibo 3 月之前
父节点
当前提交
c23289499e

+ 2 - 0
src/views/production-safety/safetyAssessment/evaluationSystem/components/EvaluationSystemDetail.vue

@@ -790,6 +790,8 @@
     if (isEditMode.value || isViewMode.value) {
       getDetail();
     } else {
+      // 创建模式下,确保附件文档字段为空
+      ruleFormData.value.attachmentDocument = [];
       // 创建模式下,确保至少有一条空白数据
       if (evaluationItems.value.length === 0) {
         evaluationItems.value = [

+ 34 - 1
src/views/production-safety/safetyAssessment/evaluationSystem/evaluationSystem.vue

@@ -190,7 +190,7 @@
 
       <!-- 下发弹窗 -->
       <el-dialog v-model="issueDialogVisible" title="下发考核表" width="480px" destroy-on-close>
-        <el-form :model="issueForm" label-width="130px">
+        <el-form :model="issueForm" label-width="130px" class="issue-dialog-form">
           <el-form-item label="部门名称:">
             <el-cascader
               ref="issueDeptCascaderRef"
@@ -200,6 +200,7 @@
               :show-all-levels="false"
               placeholder="请选择部门"
               filterable
+              style="width: 100%"
               @change="handleIssueDeptChange"
             />
           </el-form-item>
@@ -209,6 +210,7 @@
               placeholder="请选择用户组"
               filterable
               clearable
+              style="width: 100%"
             >
               <el-option
                 v-for="item in userGroupOptions"
@@ -224,6 +226,7 @@
               placeholder="请选择部门自评审核人"
               filterable
               clearable
+              style="width: 100%"
             >
               <el-option
                 v-for="user in deptSelfApproveUserList"
@@ -240,6 +243,13 @@
               placeholder="请选择计划开始日期"
               value-format="YYYY-MM-DD"
               format="YYYY-MM-DD"
+              style="width: 100%"
+              :disabled-date="(date: Date) => {
+                if (issueForm.endDate) {
+                  return date > new Date(issueForm.endDate);
+                }
+                return false;
+              }"
             />
           </el-form-item>
           <el-form-item label="计划结束日期:">
@@ -249,6 +259,13 @@
               placeholder="请选择计划结束日期"
               value-format="YYYY-MM-DD"
               format="YYYY-MM-DD"
+              style="width: 100%"
+              :disabled-date="(date: Date) => {
+                if (issueForm.startDate) {
+                  return date < new Date(issueForm.startDate);
+                }
+                return false;
+              }"
             />
           </el-form-item>
         </el-form>
@@ -504,6 +521,16 @@
       return;
     }
 
+    // 验证日期:开始日期不能大于结束日期
+    if (issueForm.startDate && issueForm.endDate) {
+      const startDate = new Date(issueForm.startDate);
+      const endDate = new Date(issueForm.endDate);
+      if (startDate > endDate) {
+        ElMessage.error('计划开始日期不能大于计划结束日期');
+        return;
+      }
+    }
+
     try {
       const payload = {
         id: currentIssueId.value,
@@ -674,4 +701,10 @@
     text-overflow: ellipsis;
     display: block;
   }
+
+  .issue-dialog-form {
+    :deep(.el-form-item__content) {
+      width: 100%;
+    }
+  }
 </style>