台账修改

src/views/data-fill/collapse-form/index.vue

@@ -500,6 +500,7 @@
             :tree-id="treeId"
             :wbs-id="wbsTemp_id"
             :wbs-type="wbs_type"
+            :table-file-type="fileTypeModal.tableFileType"
         />
        
         <HcTestFileCy
@@ -511,6 +512,7 @@
             :tree-id="treeId"
             :wbs-id="wbsTemp_id"
             :wbs-type="wbs_type"
+            :table-file-type="fileTypeModal.tableFileType"
         />
     </hc-new-dialog>
 
@@ -709,16 +711,17 @@
 
     
     <!-- 选择试验附件类型 -->
-    <hc-dialog v-model="fileTypeDialog" title="设置自动获取" :loading="fileTypeLoading" @save="fileTypeSaveClick">
+    <hc-dialog v-model="fileTypeDialog" title="选择附件类型" :loading="fileTypeLoading" @save="fileTypeSaveClick">
         <el-form
+            ref="fileTypeModalRef"
             :model="fileTypeModal"
             label-width="auto"
             size="large"
             label-position="left"
             :rules="fileTypeRules"
         >
-            <el-form-item label="选择附件类型" prop="type">
-                <el-select v-model="fileTypeModal.type" multiple block>
+            <el-form-item label="选择附件类型" prop="tableFileType">
+                <el-select v-model="fileTypeModal.tableFileType" block>
                     <el-option
                         v-for="item in fileType"
                         :key="item.dictKey"
@@ -2382,11 +2385,20 @@ const deviationSaveClick = async ()=>{
 
 //选择附件类型
 const fileTypeDialog = ref(false)
-const fileTypeSaveClick = ()=>{
+const fileTypeModalRef = ref(null)
+const fileTypeSaveClick = async ()=>{
+    const validate = await formValidate(fileTypeModalRef.value, fileTypeRules)
+    if ( !validate) {
+        return false
+    }
+    fileTypeDialog.value = false
+
+     fileModal.value = true
+    getIsUseTestTreeCy()
 
 }
 const fileTypeModal = ref({
-    type: '',
+    tableFileType: '',
    
 })
 const fileTypeLoading = ref(false)
@@ -2395,7 +2407,7 @@ const getFileType = async ()=>{
       fileType.value = await getDictionaryData('table_file_type', true )
 }
 const fileTypeRules = {
-      type: {
+      tableFileType: {
         required: true,
         trigger: 'blur',
         message: '请选择附件类型',

src/views/data-fill/collapse-form/test-file-cy.vue

@@ -78,6 +78,7 @@ const props = defineProps({
     tenantId: [String, Number],
     wbsType: [String, Number],
     treeId: [String, Number],
+    tableFileType: [String, Number], // 新增属性，用于传递附件类型
   
 })
 
@@ -88,6 +89,7 @@ const wbsTempId = ref(props.wbsId)
 const tenant_id = ref(props.tenantId)
 const wbs_type = ref(props.wbsType)
 const isPrimaryKeyId = ref(props.treeId)
+const tableFileType = ref(props.tableFileType)
 const treeProps = {
     label: 'name',
     children: 'children',
@@ -108,14 +110,16 @@ watch(() => [
     props.tenantId,
     props.wbsType,
     props.treeId,
+    props.tableFileType,
  
-], ([pid, cid, wbs_id, tid, type, treeId]) => {
+], ([pid, cid, wbs_id, tid, type, treeId, tftype]) => {
     projectId.value = pid
     contractId.value = cid
     wbsTempId.value = wbs_id
     tenant_id.value = tid
     wbs_type.value = type
     isPrimaryKeyId.value = treeId
+    tableFileType.value = tftype
    
 })
 
@@ -306,6 +310,7 @@ const savesubmitRelationFile = async (ids) => {
         nodeId: isPrimaryKeyId.value,
         type: fileModalradio.value === 'test' ? 11 : fileModalradio.value === 1 ? 12 : 13,
         ids,
+        tableFileType: tableFileType.value,
 
            
     })

src/views/data-fill/collapse-form/test-file.vue

@@ -111,6 +111,7 @@ const props = defineProps({
     tenantId: [String, Number],
     wbsType: [String, Number],
     treeId: [String, Number],
+    tableFileType: [String, Number], // 新增属性，用于传递附件类型
 })
 
 const projectId = ref(props.projectId)
@@ -120,6 +121,7 @@ const wbsTempId = ref(props.wbsId)
 const tenant_id = ref(props.tenantId)
 const wbs_type = ref(props.wbsType)
 const isPrimaryKeyId = ref(props.treeId)
+const tableFileType = ref(props.tableFileType)
 
 //监听
 watch(() => [
@@ -129,13 +131,15 @@ watch(() => [
     props.tenantId,
     props.wbsType,
     props.treeId,
-], ([pid, cid, wbs_id, tid, type, treeId]) => {
+    props.tableFileType,
+], ([pid, cid, wbs_id, tid, type, treeId, tftype]) => {
     projectId.value = pid
     contractId.value = cid
     wbsTempId.value = wbs_id
     tenant_id.value = tid
     wbs_type.value = type
     isPrimaryKeyId.value = treeId
+    tableFileType.value = tftype
 })
 
 const CTDTreeAutoExpandKeys = ref([])
@@ -366,6 +370,7 @@ const savesubmitRelationFile = async (ids) => {
         nodeId: isPrimaryKeyId.value,
         type: fileModalradio.value,
         ids,
+        tableFileType: tableFileType.value,
     })
     if (!error && code === 200) {
         window?.$message?.success('操作成功')

src/views/ledger/components/internal.vue

@@ -10,15 +10,23 @@
                                     <el-option v-for="item in InternalApproval" :key="item.value" :label="item.label" :value="item.value" />
                                 </el-select>
                             </div> -->
-                            <div class="inline-block w-32">
-                                <el-select v-model="searchInternalForm.isEvaluate" clearable placeholder="是否评定">
-                                    <el-option v-for="item in InternalAssess" :key="item.value" :label="item.label" :value="item.value" />
+                            <div class="inline-block w-40">
+                                <el-select v-model="searchInternalForm.dateIsComplete" clearable placeholder="日期是否完整">
+                                    <el-option label="是" value="是" />
+                                    <el-option label="否" value="否" />
+                                </el-select>
+                            </div>
+                            <div class="ml-2 inline-block w-38">
+                                <el-select v-model="searchInternalForm.isFile" clearable placeholder="是否缺失附件">
+                                    <el-option label="是" :value="false" />
+                                    <el-option label="否" :value="true" />
                                 </el-select>
                             </div>
                          
-                            <div class="ml-2 inline-block w-32">
-                                <el-select v-model="searchInternalForm.isExperiment" clearable placeholder="关联试验">
-                                    <el-option v-for="item in InternalAssociation" :key="item.value" :label="item.label" :value="item.value" />
+                            <div class="ml-2 inline-block w-38">
+                                <el-select v-model="searchInternalForm.dateIsComplete" clearable placeholder="节点显示">
+                                    <el-option label="按工序展示" :value="1" />
+                                    <el-option label="按本节点显示" :value="2" />
                                 </el-select>
                             </div>
                             <div class="ml-2 inline-block w-60">
@@ -51,13 +59,13 @@
             <HcTooltip v-if="!isWaterProject" keys="write_industry_download">
                 <el-button :disabled="tableInternalKeys.length <= 0" :loading="downloadLoading" hc-btn type="primary" @click="batchDownload">
                     <HcIcon name="download" />
-                    <span>下载</span>
+                    <span>导出EXCEL表格</span>
                 </el-button>
             </HcTooltip>
             <HcTooltip v-if="isWaterProject" keys="write_industry_download">
                 <el-button :disabled="tableWaterKeys.length <= 0" :loading="waterDownloadLoading" hc-btn type="primary" @click="waterBatchDownload">
                     <HcIcon name="download" />
-                    <span>下载</span>
+                    <span>导出EXCEL表格</span>
                 </el-button>
             </HcTooltip>
         </template>
@@ -83,6 +91,11 @@
                 <el-tag v-if="row.isExperiment" class="mx-1" effect="dark" type="success">是</el-tag>
                 <el-tag v-else class="mx-1" effect="dark" type="info">否</el-tag>
             </template>
+        
+            
+            <template #infoQueryName="{ row }">
+                <span class="text-link" @click="tableRowName(row)">{{ row?.infoQueryName }}</span>
+            </template>
         </HcTable>
         <template #action>
             <HcPages v-if="!isWaterProject" :pages="searchInternalForm" @change="pageInternalChange" />
@@ -195,7 +208,7 @@ const InternalAssociation = ref([
 
 //搜索表单
 const searchInternalForm = ref({
-    taskStatus: null, isEvaluate: null, reportNumber: null, isExperiment: null,
+    taskStatus: null, isFile: null, reportNumber: null, isExperiment: null, 
     current: 1, size: 20, total: 0,
 })
 
@@ -243,10 +256,10 @@ const tableInternalColumn = ref([
     { key: 'partChildProject', name: '子分部工程' },
     { key: 'subentryProject', name: '分项工程' },
     { key: 'subentryChildProject', name: '子分项工程' },
-    { key: 'process', name: '工序' },
-    { key: 'taskStatus', name: '审批状态', width: 120, align: 'center' },
-    { key: 'isEvaluate', name: '是否评定', width: 100, align: 'center' },
-    { key: 'isExperiment', name: '关联试验', width: 100, align: 'center' },
+    { key: 'infoQueryName', name: '文件题名' },
+    { key: 'taskStatus', name: '审批状态', width: 80, align: 'center' },
+    { key: 'dateIsComplete', name: '日期是否完整', width: 100, align: 'center' },
+    { key: 'fileTypeMsg', name: '附件报告', width: 100, align: 'center' },
 ])
 const tableInternalData = ref([])
 
@@ -362,4 +375,12 @@ const batchPrint = async () => {
         //window.open(res, '_blank')
     }
 }
+const tableRowName = (row)=>{
+    const res = row.pdfUrl
+    toPdfPage(res)
+}
 </script>
+
+<style lang="scss" scoped>
+
+ </style>