台账管理水利台账增加

src/api/modules/ledger/internal.js

@@ -8,6 +8,13 @@ export default {
             data: form,
         })
     },
+    async queryCurrentNodeNeiYeLedger1(form) {
+        return HcApi({
+            url: '/api/blade-business/neiYeController/queryCurrentNodeNeiYeLedger1',
+            method: 'post',
+            data: form,
+        })
+    },
     //获取当前合同段的上报批次
     async queryBatchList(form) {
         return HcApi({

src/views/ledger/components/internal.vue

@@ -5,12 +5,12 @@
                 <div class="relative w-full">
                     <el-scrollbar>
                         <div v-if="!isWaterProject" class="relative whitespace-nowrap">
-                            <div class="inline-block w-32">
+                            <!-- <div class="inline-block w-32">
                                 <el-select v-model="searchInternalForm.taskStatus" clearable placeholder="审批状态">
                                     <el-option v-for="item in InternalApproval" :key="item.value" :label="item.label" :value="item.value" />
                                 </el-select>
-                            </div>
-                            <div class="ml-2 inline-block w-32">
+                            </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" />
                                 </el-select>
@@ -31,12 +31,16 @@
                                 </el-button>
                             </div>
                         </div>
-                        <div v-else>
-                            <div class="inline-block w-32">
-                                <el-select v-model="searchWaterForm.isTotal" clearable placeholder="审批状态">
+                        <div v-else class="relative whitespace-nowrap">
+                            <div class="inline-block w-64">
+                                <el-select v-model="searchWaterForm.type" clearable placeholder="审批状态">
                                     <el-option label="汇总统计" :value="1" />
                                     <el-option label="详细统计" :value="2" />
                                 </el-select>
+                                <el-button type="primary" @click="getTableWaterData">
+                                    <HcIcon name="search-2" />
+                                    <span>搜索</span>
+                                </el-button>
                             </div>
                         </div>
                     </el-scrollbar>
@@ -82,7 +86,7 @@
         </HcTable>
         <template #action>
             <HcPages v-if="!isWaterProject" :pages="searchInternalForm" @change="pageInternalChange" />
-            <HcPages v-if="isWaterProject" :pages="searchWaterForm" @change="pageWaterChange" />
+            <!-- <HcPages v-if="isWaterProject" :pages="searchWaterForm" @change="pageWaterChange" /> -->
         </template>
 
         <HcTable
@@ -113,35 +117,40 @@ const props = defineProps({
         type: Object,
         default: () => ({}),
     },
+    isWaterProject: {
+        type: Boolean,
+        default: false,
+    },
 })
 
 //变量
 const projectId = ref(props.projectId)
 const contractId = ref(props.contractId)
 const nodeData = ref(props.treeData)
-const isWaterProject = ref(false)
+const isWaterProject = ref(props.isWaterProject)
 const searchWaterForm = ref({
-    isTotal:1,
-    current: 1, size: 20, total: 0,
+    type:1,
+ 
 })
 const tableWaterColumn = ref([
-{ key: 'unitProject', name: '单位工程' },
-    { key: 'partProject', name: '分部工程' },
-    { key: 'partChildProject', name: '子分部工程' },
-    { key: 'subentryProject', name: '单元工程' },
-    { key: 'subentryChildProject', name: '单元工程个数' },
-    { key: 'process', name: '合格个数' },
-    { key: 'process', name: '其中优良个数' }, 
-     { key: 'process', name: '优良率(%)' },
+{ key: 'className', name: '单位工程' },
+    { key: 'partName', name: '分部工程' },
+    { key: 'subPartName', name: '子分部工程' },
+    { key: 'unitName', name: '单元工程' },
+    { key: 'unitCount', name: '单元工程个数' },
+    { key: 'passCount', name: '合格个数' },
+    { key: 'goodCount', name: '其中优良个数' }, 
+     { key: 'goodRate', name: '优良率(%)' },
   
 ])
-const tableWaterData = ref([])
-const tableWaterLoading = ref(false)
+
 //监听
 watch(() => [
     props.treeData,
-], ([treeData]) => {
+    props.isWaterProject,
+], ([treeData, water]) => {
     nodeData.value = treeData
+    isWaterProject.value = water
     setQueryData(treeData)
 })
 
@@ -201,7 +210,12 @@ const searchInternalKeyUp = (e) => {
 const searchInternalClick = () => {
     if (searchInternalForm.value?.wbsIds) {
         searchInternalForm.value.current = 1
-        getTableInternalData()
+        if (isWaterProject.value) {
+            getTableWaterData()
+        } else {
+            getTableInternalData()
+        }
+        
 
     } else {
         window?.$message?.warning('请先选择一个树节点')
@@ -214,15 +228,12 @@ const pageInternalChange = ({ current, size }) => {
     searchInternalForm.value.size = size
     getTableInternalData()
 }
-const pageWaterChange = ({ current, size }) => {
-    searchWaterForm.value.current = current
-    searchWaterForm.value.size = size
-    getWaterData()
-}
+// const pageWaterChange = ({ current, size }) => {
+//     searchWaterForm.value.current = current
+//     searchWaterForm.value.size = size
+//     getTableWaterData()
+// }
 //获取水利水电工程台账
-const getWaterData = ()=>{
-    
-}
 
 //内业台账表头
 const tableInternalRef = ref(null)
@@ -258,6 +269,28 @@ const getTableInternalData = async () => {
     }
 }
 
+//获取数据
+const tableWaterData = ref([])
+const tableWaterLoading = ref(false)
+const getTableWaterData = async () => {
+    tableWaterLoading.value = true
+    const { error, code, data } = await internalApi.queryCurrentNodeNeiYeLedger1({
+        ...searchWaterForm.value,
+        projectId: projectId.value,
+        pkeyId: nodeData.value['primaryKeyId'],
+       
+    })
+    //判断状态
+    tableWaterLoading.value = false
+    if (!error && code === 200) {
+        tableWaterData.value = getArrValue(data['records'])
+ 
+    } else {
+        tableWaterData.value = []
+  
+    }
+}
+
 //多选
 const tableInternalKeys = ref([])
 const tableInternalSelection = (rows) => {

src/views/ledger/write.vue

@@ -32,7 +32,7 @@
                 <template #tab-internal>
                     <HcInternal
                         v-if="sbTableKey === 'internal'" :contract-id="contractId" :project-id="projectId"
-                        :tree-data="nodeDataInfo"
+                        :tree-data="nodeDataInfo" :is-water-project="isWaterProject"
                     />
                 </template>
                 <template #tab-construction>
@@ -60,6 +60,7 @@ import HcConstruction from './components/construction.vue'
 import { getStoreValue, setStoreValue } from '~src/utils/storage'
 import queryApi from '~api/data-fill/query'
 import { getArrValue, getObjValue } from 'js-fast-way'
+import wbsApi from '~api/data-fill/wbs'
 
 //变量
 const router = useRouter()
@@ -142,13 +143,25 @@ const getTypeData = (key) => {
         treeAutoExpandKeys.value = getStoreValue('ledgerWriteTreeKeys') || []
     }
 }
-
+//判断是否是水利工程
+const getIsWaterProject = async () => {
+    const { error, code, msg, data } = await wbsApi.evaluateIsWater({
+        projectId: projectId.value,
+    })
+    if (!error && code === 200) {
+      isWaterProject.value = data
+    } else {
+        window?.$message?.error(msg || '操作失败')
+    }
+}
 //树被点击
 const nodeDataInfo = ref({})
+const isWaterProject = ref(false)
 const nodeWbsElTreeClick = ({ data, keys }) => {
     nodeDataInfo.value = data
     setStoreValue('ledgerWriteTreeKeys', keys)
     treeAutoExpandKeys.value = keys || []
+    getIsWaterProject()
 }
 
 //左右拖动，改变树形结构宽度