|
@@ -2,39 +2,43 @@
|
|
<HcNewCard>
|
|
<HcNewCard>
|
|
<template #header>
|
|
<template #header>
|
|
<div class="absolute inset-0" style="height: 32px; top: -14px">
|
|
<div class="absolute inset-0" style="height: 32px; top: -14px">
|
|
- <div class="relative w-full ">
|
|
|
|
|
|
+ <div class="relative w-full">
|
|
<el-scrollbar>
|
|
<el-scrollbar>
|
|
- <div class="relative whitespace-nowrap">
|
|
|
|
- <div class="w-32 inline-block">
|
|
|
|
|
|
+ <div v-if="!isWaterProject" class="relative whitespace-nowrap">
|
|
|
|
+ <div class="inline-block w-32">
|
|
<el-select v-model="searchInternalForm.taskStatus" clearable placeholder="审批状态">
|
|
<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-option v-for="item in InternalApproval" :key="item.value" :label="item.label" :value="item.value" />
|
|
</el-select>
|
|
</el-select>
|
|
</div>
|
|
</div>
|
|
- <div class="w-32 ml-2 inline-block">
|
|
|
|
|
|
+ <div class="ml-2 inline-block w-32">
|
|
<el-select v-model="searchInternalForm.isEvaluate" clearable placeholder="是否评定">
|
|
<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-option v-for="item in InternalAssess" :key="item.value" :label="item.label" :value="item.value" />
|
|
</el-select>
|
|
</el-select>
|
|
</div>
|
|
</div>
|
|
- <div class="w-32 ml-2 inline-block">
|
|
|
|
- <el-select v-model="searchInternalForm.reportNumber" clearable placeholder="上报批次">
|
|
|
|
- <el-option v-for="item in InternalReportBatch" :key="item" :label="item" :value="item" />
|
|
|
|
- </el-select>
|
|
|
|
- </div>
|
|
|
|
- <div class="w-32 ml-2 inline-block">
|
|
|
|
|
|
+
|
|
|
|
+ <div class="ml-2 inline-block w-32">
|
|
<el-select v-model="searchInternalForm.isExperiment" clearable placeholder="关联试验">
|
|
<el-select v-model="searchInternalForm.isExperiment" clearable placeholder="关联试验">
|
|
<el-option v-for="item in InternalAssociation" :key="item.value" :label="item.label" :value="item.value" />
|
|
<el-option v-for="item in InternalAssociation" :key="item.value" :label="item.label" :value="item.value" />
|
|
</el-select>
|
|
</el-select>
|
|
</div>
|
|
</div>
|
|
- <div class="w-60 ml-2 inline-block">
|
|
|
|
|
|
+ <div class="ml-2 inline-block w-60">
|
|
<el-input v-model="searchInternalForm.queryStr" clearable placeholder="请输入名称关键词检索" @keyup="searchInternalKeyUp" />
|
|
<el-input v-model="searchInternalForm.queryStr" clearable placeholder="请输入名称关键词检索" @keyup="searchInternalKeyUp" />
|
|
</div>
|
|
</div>
|
|
- <div class="ml-2 inline-block">
|
|
|
|
|
|
+ <div class="ml-2 inline-block">
|
|
<el-button type="primary" @click="searchInternalClick">
|
|
<el-button type="primary" @click="searchInternalClick">
|
|
<HcIcon name="search-2" />
|
|
<HcIcon name="search-2" />
|
|
<span>搜索</span>
|
|
<span>搜索</span>
|
|
</el-button>
|
|
</el-button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
+ <div v-else>
|
|
|
|
+ <div class="inline-block w-32">
|
|
|
|
+ <el-select v-model="searchWaterForm.isTotal" clearable placeholder="审批状态">
|
|
|
|
+ <el-option label="汇总统计" :value="1" />
|
|
|
|
+ <el-option label="详细统计" :value="2" />
|
|
|
|
+ </el-select>
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
</el-scrollbar>
|
|
</el-scrollbar>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -54,8 +58,9 @@
|
|
</HcTooltip>
|
|
</HcTooltip>
|
|
</template>
|
|
</template>
|
|
<HcTable
|
|
<HcTable
|
|
- ref="tableInternalRef" :column="tableInternalColumn" :datas="tableInternalData" :loading="tableInternalLoading"
|
|
|
|
- is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
|
|
|
|
|
|
+ v-if="!isWaterProject" ref="tableInternalRef" :column="tableInternalColumn" :datas="tableInternalData"
|
|
|
|
+ :loading="tableInternalLoading" is-new :index-style="{ width: 60 }" is-check
|
|
|
|
+ :check-style="{ width: 29 }"
|
|
@selection-change="tableInternalSelection"
|
|
@selection-change="tableInternalSelection"
|
|
>
|
|
>
|
|
<template #taskStatus="{ row }">
|
|
<template #taskStatus="{ row }">
|
|
@@ -76,8 +81,14 @@
|
|
</template>
|
|
</template>
|
|
</HcTable>
|
|
</HcTable>
|
|
<template #action>
|
|
<template #action>
|
|
- <HcPages :pages="searchInternalForm" @change="pageInternalChange" />
|
|
|
|
|
|
+ <HcPages v-if="!isWaterProject" :pages="searchInternalForm" @change="pageInternalChange" />
|
|
|
|
+ <HcPages v-if="isWaterProject" :pages="searchWaterForm" @change="pageWaterChange" />
|
|
</template>
|
|
</template>
|
|
|
|
+
|
|
|
|
+ <HcTable
|
|
|
|
+ v-if="isWaterProject" :column="tableWaterColumn" :datas="tableWaterData"
|
|
|
|
+ :loading="tableWaterLoading" is-new :index-style="{ width: 60 }"
|
|
|
|
+ />
|
|
</HcNewCard>
|
|
</HcNewCard>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -108,7 +119,24 @@ const props = defineProps({
|
|
const projectId = ref(props.projectId)
|
|
const projectId = ref(props.projectId)
|
|
const contractId = ref(props.contractId)
|
|
const contractId = ref(props.contractId)
|
|
const nodeData = ref(props.treeData)
|
|
const nodeData = ref(props.treeData)
|
|
-
|
|
|
|
|
|
+const isWaterProject = ref(false)
|
|
|
|
+const searchWaterForm = ref({
|
|
|
|
+ isTotal:1,
|
|
|
|
+ current: 1, size: 20, total: 0,
|
|
|
|
+})
|
|
|
|
+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: '优良率(%)' },
|
|
|
|
+
|
|
|
|
+])
|
|
|
|
+const tableWaterData = ref([])
|
|
|
|
+const tableWaterLoading = ref(false)
|
|
//监听
|
|
//监听
|
|
watch(() => [
|
|
watch(() => [
|
|
props.treeData,
|
|
props.treeData,
|
|
@@ -120,7 +148,7 @@ watch(() => [
|
|
//渲染完成
|
|
//渲染完成
|
|
nextTick(() => {
|
|
nextTick(() => {
|
|
setQueryData(props.treeData)
|
|
setQueryData(props.treeData)
|
|
- queryBatchList()
|
|
|
|
|
|
+
|
|
})
|
|
})
|
|
|
|
|
|
//获取相关数据
|
|
//获取相关数据
|
|
@@ -147,36 +175,9 @@ const InternalAssess = ref([
|
|
{ label: '否', value: false },
|
|
{ label: '否', value: false },
|
|
])
|
|
])
|
|
|
|
|
|
-//上报批次
|
|
|
|
-const InternalReportBatch = ref([
|
|
|
|
- // {label: "1", value: 1},
|
|
|
|
- // {label: "2", value: 2},
|
|
|
|
- // {label: "3", value: 3},
|
|
|
|
-])
|
|
|
|
|
|
|
|
-//获取上报批次
|
|
|
|
|
|
|
|
-const queryBatchList = async () => {
|
|
|
|
|
|
|
|
- if (contractId.value) {
|
|
|
|
- // const { error, code, data } = await internalApi.queryBatchList({
|
|
|
|
- // projectId: projectId.value,
|
|
|
|
- // contractId: contractId.value || ''
|
|
|
|
- // })
|
|
|
|
- const { error, code, data } = await queryApi.getReportNumber({
|
|
|
|
- projectId: projectId.value,
|
|
|
|
- contractId: contractId.value || '',
|
|
|
|
- type: 1,
|
|
|
|
- })
|
|
|
|
- if (!error && code === 200) {
|
|
|
|
- InternalReportBatch.value = getArrValue(data)
|
|
|
|
- } else {
|
|
|
|
- InternalReportBatch.value = []
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- InternalReportBatch.value = []
|
|
|
|
- }
|
|
|
|
-}
|
|
|
|
//是否关联试验
|
|
//是否关联试验
|
|
const InternalAssociation = ref([
|
|
const InternalAssociation = ref([
|
|
{ label: '是', value: true },
|
|
{ label: '是', value: true },
|
|
@@ -213,6 +214,15 @@ const pageInternalChange = ({ current, size }) => {
|
|
searchInternalForm.value.size = size
|
|
searchInternalForm.value.size = size
|
|
getTableInternalData()
|
|
getTableInternalData()
|
|
}
|
|
}
|
|
|
|
+const pageWaterChange = ({ current, size }) => {
|
|
|
|
+ searchWaterForm.value.current = current
|
|
|
|
+ searchWaterForm.value.size = size
|
|
|
|
+ getWaterData()
|
|
|
|
+}
|
|
|
|
+//获取水利水电工程台账
|
|
|
|
+const getWaterData = ()=>{
|
|
|
|
+
|
|
|
|
+}
|
|
|
|
|
|
//内业台账表头
|
|
//内业台账表头
|
|
const tableInternalRef = ref(null)
|
|
const tableInternalRef = ref(null)
|
|
@@ -224,7 +234,7 @@ const tableInternalColumn = ref([
|
|
{ key: 'subentryChildProject', name: '子分项工程' },
|
|
{ key: 'subentryChildProject', name: '子分项工程' },
|
|
{ key: 'process', name: '工序' },
|
|
{ key: 'process', name: '工序' },
|
|
{ key: 'taskStatus', name: '审批状态', width: 120, align: 'center' },
|
|
{ key: 'taskStatus', name: '审批状态', width: 120, align: 'center' },
|
|
- { key: 'reportNumber', name: '上报批次', width: 100, align: 'center' },
|
|
|
|
|
|
+
|
|
{ key: 'isEvaluate', name: '是否评定', width: 100, align: 'center' },
|
|
{ key: 'isEvaluate', name: '是否评定', width: 100, align: 'center' },
|
|
{ key: 'isExperiment', name: '关联试验', width: 100, align: 'center' },
|
|
{ key: 'isExperiment', name: '关联试验', width: 100, align: 'center' },
|
|
])
|
|
])
|