Merge branch 'master' of http://1.71.9.215:3000/feiyi/cbjsxt-front-master

src/components/costAudit/AuditEntityFormtDialog.vue

@@ -328,6 +328,11 @@
         type: String,
         default: '',
       },
+      // 单位信息（编辑/查看模式下使用）
+      unitInfo: {
+        type: Object,
+        default: () => {},
+      },
       // 是否为查看模式
       isViewMode: {
         type: Boolean,
@@ -631,6 +636,7 @@
           })
           // 格式化接口返回的数据
           this.formData = {
+            ...this.unitInfo,
             ...res.value,
             // 将逗号分隔的字符串转换为数组
             relatedUnits: res.value.relatedUnits

src/views/costAudit/auditInfo/auditManage/auditDocumentsMain.vue

@@ -146,6 +146,7 @@
       width="82%"
       :close-on-click-modal="false"
       :z-index="9999"
+      :confirm-text="isView ? '查看' : '生成文书'"
       @cancel="handleCancel"
       @confirm="handleConfirm"
     >
@@ -620,6 +621,10 @@
               ) {
                 this.dataUploadUrl = item.dataValue
               }
+              if (item.pinyin.includes('DiGaoNeiRong') && item.dataValue) {
+                // 移除所有HTML标签
+                item.dataValue = item.dataValue.replace(/<[^>]+>/g, '')
+              }
             })
           }
         },
@@ -769,6 +774,11 @@
           updateBy: '',
           updateTime: '',
         }
+        this.fileUrl = ''
+        // 重置表单校验状态
+        if (this.$refs.documentForm) {
+          this.$refs.documentForm.resetFields()
+        }
         // if(this.isMultipleMode){
         //   this.document.enterpriseId = this.project.auditedUnitId ? this.project.auditedUnitId.split(',') : []
         //   console.log('this.document.enterpriseId',this.document.enterpriseId)

src/views/costAudit/baseInfo/auditEntityManage/index.vue

@@ -111,6 +111,7 @@
       :dialog-visible="dialogVisible"
       :dialog-title="dialogTitle"
       :unit-id="currentUnitId"
+      :unit-info="currentUnit"
       :is-view-mode="isViewMode"
       @confirm="handleDialogSuccess"
       @update:dialogVisible="dialogVisible = $event"
@@ -150,6 +151,7 @@
         dialogVisible: false,
         dialogTitle: '',
         currentUnitId: '',
+        currentUnit: {},
         isViewMode: false,
         // 表格列配置
         columns: [
@@ -275,6 +277,7 @@
       handleEdit(row) {
         this.dialogTitle = '修改被监审单位信息'
         this.currentUnitId = row.unitId
+        this.currentUnit = row
         this.isViewMode = false
         this.dialogVisible = true
       },
@@ -283,6 +286,7 @@
       handleView(row) {
         this.dialogTitle = '查看被监审单位信息'
         this.currentUnitId = row.unitId
+        this.currentUnit = row
         this.isViewMode = true
         this.dialogVisible = true
       },

src/views/costAudit/baseInfo/statistics/comprehensiveQuery.vue

@@ -72,6 +72,7 @@
         :stripe="false"
         :span-method="handleSpanMethod"
         :row-style="rowStyle"
+        :row-class-name="'no-stripe-row'"
         @pagination-change="handlePaginationChange"
       >
         <template #index="{ row, index }">
@@ -331,12 +332,6 @@
         // 重新加载数据
         this.handleQuery()
       },
-      // 处理下载监审任务
-      handleDownloadTask(row) {
-        console.log('下载监审任务:', row)
-        // 这里实现下载逻辑
-        this.$message.success('监审任务功能待实现')
-      },
       // 处理下载监审卷宗
       handleDownloadFile(row) {
         console.log('下载监审卷宗:', row)
@@ -450,4 +445,12 @@
   .show-row {
     display: block;
   }
+  // 覆盖斑马纹效果
+  ::v-deep .no-stripe-row {
+    background-color: #ffffff !important;
+  }
+  // 确保所有行都没有斑马纹
+  ::v-deep .el-table__body tr {
+    background-color: #ffffff !important;
+  }
 </style>

src/views/costAudit/projectInfo/auditTaskManage/taskCustomizedRelease/auditNoticeTab.vue

@@ -146,6 +146,7 @@
       :visible="documentDialogVisible"
       width="82%"
       :close-on-click-modal="false"
+      :confirm-text="isViewMode ? '查看' : '生成文书'"
       @cancel="handleCancel"
       @confirm="handleConfirm"
     >
@@ -542,6 +543,10 @@
               ) {
                 this.dataUploadUrl = item.dataValue
               }
+              if (item.pinyin.includes('DiGaoNeiRong') && item.dataValue) {
+                // 移除所有HTML标签
+                item.dataValue = item.dataValue.replace(/<[^>]+>/g, '')
+              }
             })
           }
         },
@@ -667,6 +672,10 @@
         // }
         this.loadOpts()
         this.fileUrl = ''
+        // 重置表单校验状态
+        if (this.$refs.documentForm) {
+          this.$refs.documentForm.resetFields()
+        }
         if (this.activeDocumentTypeId) {
           this.document.documentId = this.activeDocumentTypeId
           this.handleTemplateChange()