Pārlūkot izejas kodu

fix(审核/报告单): 修正审核人层级标签并增加报告单合并校验

- 五审/四审界面"已审核内容"区审核人及审核时间标签由误显示的"二审"更正为对应层级(五审->四审、四审->三审),避免跨层级错误显示
- 报告单生成画面【生成】按钮增加前端校验:仅当物料类型(物料名称)与委托日期(天)完全一致才允许合并,否则提示"不同日期不允许合并,不同物料类型也不允许合并"并拦截生成
zhangwc 3 nedēļas atpakaļ
vecāks
revīzija
14a56bc706

+ 2 - 2
src/views/approveManagement/components/fiveApprove.vue

@@ -298,9 +298,9 @@
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="75px" prop="ENTR_MEMO"
                   label="委托备注"></el-table-column>
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="100px" prop="AUDIT_MAN"
-                  label="二审审核人"></el-table-column>
+                  label="四审审核人"></el-table-column>
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="140px" prop="AUDIT_TIME"
-                  label="二审审核时间"></el-table-column>
+                  label="四审审核时间"></el-table-column>
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="75px" prop="CREATE_MAN"
                   label="创建人"></el-table-column>
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="125px" prop="CREATE_TIME"

+ 2 - 2
src/views/approveManagement/components/fourApprove.vue

@@ -407,9 +407,9 @@
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="75px" prop="ENTR_MEMO"
                   label="委托备注"></el-table-column>
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="100px" prop="AUDIT_MAN"
-                  label="二审审核人"></el-table-column>
+                  label="三审审核人"></el-table-column>
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="140px" prop="AUDIT_TIME"
-                  label="二审审核时间"></el-table-column>
+                  label="三审审核时间"></el-table-column>
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="75px" prop="CREATE_MAN"
                   label="创建人"></el-table-column>
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="125px" prop="CREATE_TIME"

+ 20 - 0
src/views/certificateManagement/components/reportSheetGeneration/reportSheetGeneration.vue

@@ -1347,6 +1347,26 @@ export default {
         this.$message.warning("请先勾选中要生成的报告信息表数据");
         return;
       }
+      // 合并生成报告单限制:物料类型(物料名称)与委托日期(天)必须完全一致,否则不允许合并
+      const matNameSet = new Set();
+      const entrDateSet = new Set();
+      const getDay = (val) => {
+        if (!val) return "";
+        if (typeof val === "string") {
+          // 兼容 "yyyy-MM-dd HH:mm:ss" / "yyyy-MM-dd" / ISO 等,统一截断到天
+          return val.length >= 10 ? val.substring(0, 10) : val;
+        }
+        const d = new Date(val);
+        return isNaN(d.getTime()) ? String(val) : this.getYNM(d);
+      };
+      this.multipleSelection1.forEach((a) => {
+        matNameSet.add(a.matName);
+        entrDateSet.add(getDay(a.entrTime));
+      });
+      if (matNameSet.size > 1 || entrDateSet.size > 1) {
+        this.$message.error("不同日期不允许合并,不同物料类型也不允许合并");
+        return;
+      }
       this.creteLoading = true;
       let arr = [];
       this.multipleSelection1.forEach((a) => {