bug修复

src/api/modules/data-fill/wbs.js

@@ -193,7 +193,7 @@ export default {
             params: form
         },msg)
     },
-    //  blade-manager/formula/range?design=100&size=10&dev=±5&key=key_8&pkId=1572864992552681472
+    //设计值计算
     async queryFormulaRange(form, msg = true) {
         return httpApi({
             url: '/api/blade-manager/formula/range',
@@ -201,4 +201,12 @@ export default {
             params: form
         },msg)
     },
+    //获取文件题名
+    async queryDocumentTitle(form, msg = true) {
+        return httpApi({
+            url: '/api/blade-business/informationWriteQuery/queryDocumentTitle',
+            method: 'get',
+            params: form
+        },msg)
+    },
 }

src/views/data-fill/wbs.vue

@@ -39,7 +39,7 @@
             <HcDrawer :show="isDrawer" actionUi="text-center" to-id="wbs-node-tree-card-target" @close="drawerClose">
                 <!--清表列表-->
                 <el-scrollbar ref="ListItemScrollRef" v-if="ListItemDatas.length > 0">
-                    <ListItem ref="ListItemsRef" :datas="ListItemDatas" :status="NodeStatus" :classify="authBtnTabKey" @offsetTop="ListItemOffsetTop" @renew="getTableDataAll"/>
+                    <ListItem ref="ListItemsRef" :datas="ListItemDatas" :status="NodeStatus" :classify="authBtnTabKey" @offsetTop="ListItemOffsetTop" :primaryKeyId="primaryKeyId" @renew="getTableDataAll"/>
                 </el-scrollbar>
                 <HcStatus text="暂无表单" v-else/>
                 <!--底部按钮区域-->
@@ -140,7 +140,7 @@
                     </template>
                     <!--清表列表-->
                     <el-scrollbar ref="ListItemScrollRef" v-loading="ListItemLoading" v-if="ListItemDatas.length > 0">
-                        <ListItem ref="ListItemRef" :datas="ListItemDatas" :status="NodeStatus" :classify="authBtnTabKey" @offsetTop="ListItemOffsetTop" @renew="getTableDataAll"/>
+                        <ListItem ref="ListItemRef" :datas="ListItemDatas" :status="NodeStatus" :classify="authBtnTabKey" @offsetTop="ListItemOffsetTop" :primaryKeyId="primaryKeyId" @renew="getTableDataAll"/>
                     </el-scrollbar>
 
                     <HcStatus text="暂无表单" v-else/>
@@ -339,7 +339,7 @@ import Draggable from "vuedraggable";
 const router = useRouter()
 const useRoutes = useRoute()
 const useAppState = useAppStore()
-const {getObjValue, getArrValue, getObjNullValue} = isType()
+const {getObjValue, getArrValue, getObjNullValue, isString} = isType()
 
 //全局变量
 const projectId = ref(useAppState.getProjectId);
@@ -1069,17 +1069,23 @@ const reportIds = ref('')
 const reportTaskName = ref('')
 const reportAddition = ref({})
 const showReportModal = ref(false)
-const reportModalClick = () => {
+const reportModalClick = async () => {
     const info = nodeDataInfo.value;
     const rows = ListItemDatas.value;
-    reportIds.value = info['contractIdRelation'] ? info['id'] : info['primaryKeyId']
     if (rows.length > 0) {
-        reportTaskName.value = rows.length > 1?`${rows[0].nodeName}等${rows.length}个文件`:rows[0].nodeName
+        //初始弹出弹窗，防呆
+        reportIds.value = info['primaryKeyId']
         reportAddition.value = {
             classify: authBtnTabKey.value,
             contractIdRelation: info['contractIdRelation'],
         }
         showReportModal.value = true
+        //请求文件题名
+        const {data} = await wbsApi.queryDocumentTitle({
+            primaryKeyId: info['primaryKeyId'],
+            classify: authBtnTabKey.value
+        })
+        reportTaskName.value = isString(data)? data : ''
     } else {
         window.$message?.warning('暂无相关数据')
     }
@@ -1143,8 +1149,7 @@ const setFormRegExpJson = (FormRegExpJson) => {
             }
         }
     })
-    const activeKey = ListItemRef.value?.getActiveKey()
-    console.log(activeKey,itemId)
+    //const activeKey = ListItemRef.value?.getActiveKey()
     //弹出提示
     const val = '<div style="font-size: 16px;">请先完善  <span style="color:#1ECC95;">' + nodeName + '</span>  的数据内容</div>'
     window?.$messageBox?.alert(val, '表单完善提醒', {

src/views/ledger/components/table-form.vue

@@ -51,37 +51,37 @@
                 </el-button>
             </HcTooltip>
             <HcTooltip keys="ledger_query_report_form">
-                <el-button hc-btn :disabled="!isTableForm || taskStatus === 3 || taskStatus === 4" @click="reportModalClick">
+                <el-button hc-btn :disabled="!isTableForm || taskStatus === 1 || taskStatus === 3 || taskStatus === 4" @click="reportModalClick">
                     <HcIcon name="send-plane-2"/>
                     <span>上报</span>
                 </el-button>
             </HcTooltip>
             <HcTooltip keys="ledger_query_preview_form">
-                <el-button hc-btn :disabled="!isTableForm" :loading="previewLoading" @click="previewBussPdf">
+                <el-button hc-btn :disabled="!isTableForm || taskStatus === 1 " :loading="previewLoading" @click="previewBussPdf">
                     <HcIcon name="eye"/>
                     <span>预览</span>
                 </el-button>
             </HcTooltip>
             <HcTooltip keys="ledger_query_copy_form">
-                <el-button hc-btn :disabled="!isTableForm || taskStatus === 3 || taskStatus === 4" @click="copyTableFormClick">
+                <el-button hc-btn :disabled="!isTableForm || taskStatus === 1  || taskStatus === 3 || taskStatus === 4" @click="copyTableFormClick">
                     <HcIcon name="file-copy-2"/>
                     <span>复制当前表格及内容</span>
                 </el-button>
             </HcTooltip>
             <HcTooltip keys="ledger_query_time_form">
-                <el-button hc-btn :disabled="!isTableForm || taskStatus === 3 || taskStatus === 4" @click="copyTimeLogModal">
+                <el-button hc-btn :disabled="!isTableForm || taskStatus === 1  || taskStatus === 3 || taskStatus === 4" @click="copyTimeLogModal">
                     <HcIcon name="file-copy-2"/>
                     <span>复制任意时间</span>
                 </el-button>
             </HcTooltip>
             <HcTooltip keys="ledger_query_add_form">
-                <el-button hc-btn :disabled="!isTableForm || taskStatus === 3 || taskStatus === 4" @click="addTableFormClick">
+                <el-button hc-btn :disabled="!isTableForm || taskStatus === 1  || taskStatus === 3 || taskStatus === 4" @click="addTableFormClick">
                     <HcIcon name="add-circle"/>
                     <span>新增表格</span>
                 </el-button>
             </HcTooltip>
             <HcTooltip keys="ledger_query_abolish_form">
-                <el-button hc-btn :disabled="!isTableForm || taskStatus === 1 || taskStatus === 2" @click="abolishTableFormClick">
+                <el-button hc-btn :disabled="!isTableForm || taskStatus === 1  || taskStatus === 2" @click="abolishTableFormClick">
                     <HcIcon name="delete-bin-3"/>
                     <span>废除</span>
                 </el-button>
@@ -415,6 +415,7 @@ const tableFormSaveLoading = ref(false)
 const tableFormSaveClick = async () => {
     const res = await saveExcelBussData()
     if (res) {
+        checkTheLogTaskStatus()
         await getBussPdfInfo()
     }
 }
@@ -459,6 +460,7 @@ const getLinkTabIds = () => {
 const previewLoading = ref(false)
 const previewBussPdf = () => {
     getBussPdfInfo()
+    checkTheLogTaskStatus()
 }
 
 //预览PDF
@@ -577,7 +579,9 @@ const setFormDefaultData = (formInfo = {}) => {
 //删除记录
 const closeBussDataInfo = (index) => {
     formLogDataList.value.splice(index, 1)
-    formLogIndex.value = index <= 0 ?  0 : index - 1
+    const logIndex = index <= 0 ?  0 : index - 1
+    formLogIndex.value = logIndex
+    getBussDataInfo(logIndex)
 }
 
 //批量上报

src/views/tasks/hc-data.vue

@@ -20,7 +20,7 @@
             <template #header="{ titleId, titleClass }">
                 <div class="hc-card-header flex items-center">
                     <div :id="titleId" :class="titleClass">任务审核 【已开启电签】</div>
-                    <div class="ml-6 font-bold text-main" v-if="taskReviewType === '1'">任务名称：{{taskReviewName}}</div>
+                    <div class="ml-6 font-bold text-main" v-if="taskReviewType === '1'">任务名称：{{taskReviewInfo.taskName}}</div>
                 </div>
             </template>
             <div class="hc-card-body-flex">
@@ -158,7 +158,6 @@ const rowTaskName = async (row) => {
             const approvalFileList = getArrValue(data['approvalFileList'])
             taskReviewData.value = approvalFileList
             if (approvalFileList.length > 0) {
-                taskReviewName.value = approvalFileList[0].fileName
                 batchPdfUrl.value = approvalFileList[0].fileUrl
             }
             taskReviewType.value = '1'
@@ -166,7 +165,6 @@ const rowTaskName = async (row) => {
         } else {
             taskReviewData.value = []
             batchPdfUrl.value = ''
-            taskReviewName.value = ''
         }
     } else {
         taskReviewInfo.value = {}
@@ -193,10 +191,8 @@ const batchApprovalTaskClick = (rows) => {
 const rowTaskReviewClick = async ({row}) => {
     const type = taskReviewType.value
     if (type === '1') {
-        taskReviewName.value = row.fileName
         batchPdfUrl.value = row.fileUrl
     } else if (row['hc_batchPdfUrl']) {
-        taskReviewName.value = row.fileName
         batchPdfUrl.value = row['hc_batchPdfUrl']
     } else {
         queryTaskInfo(row)
@@ -204,7 +200,6 @@ const rowTaskReviewClick = async ({row}) => {
 }
 
 //获取PDF数据
-const taskReviewName = ref('')
 const queryTaskInfo = async (row) => {
     const { error, code, data } = await tasksApi.queryTaskInfo({
         formDataId: row['formDataId'] || '',
@@ -214,13 +209,11 @@ const queryTaskInfo = async (row) => {
     if (!error && code === 200) {
         const approvalFileList = getArrValue(data['approvalFileList'])
         if (approvalFileList.length > 0) {
-            taskReviewName.value = approvalFileList[0].fileName
             batchPdfUrl.value = approvalFileList[0].fileUrl
             row['hc_batchPdfUrl'] = approvalFileList[0].fileUrl
         } else {
             batchPdfUrl.value = ''
             row['hc_batchPdfUrl'] = ''
-            taskReviewName.value = ''
             window?.$message?.warning('PDF获取异常')
         }
     } else {
@@ -302,7 +295,7 @@ const saveCompleteApprovalTask = async () => {
         SMSAuthShow.value = false
         showTaskReviewModal.value = false
         window?.$message?.success('审批成功')
-        window?.location?.reload()  //刷新页面
+        //window?.location?.reload()  //刷新页面
     } else {
         window?.$message?.warning('审批异常')
     }
@@ -325,7 +318,7 @@ const batchCompleteApprovalTask = async() => {
         SMSAuthShow.value = false
         showTaskReviewModal.value = false
         window?.$message?.success('审批成功')
-        window?.location?.reload()  //刷新页面
+        //window?.location?.reload()  //刷新页面
     } else {
         window?.$message?.warning('审批出错')
     }
@@ -348,8 +341,6 @@ const setSignRulesClick = () => {
 const dateUpdateValue = (val) => {
     formReport.value.date = val
 }
-
-
 </script>
 
 <style lang="scss" scoped>