From c67aec6636aea4e2b0c534d62d82addd2c420de4 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 15 Mar 2024 13:54:33 +0800
Subject: [PATCH] add
---
src/views/cost_projects/index.vue | 2 -
.../manage_monthly_progress_report/index.vue | 8 +-
src/views/manage_project/index.vue | 103 +++++++++++-------
src/views/project_rectification/index.vue | 84 +++++++-------
.../index.vue | 51 +++++----
.../index.vue | 12 +-
6 files changed, 141 insertions(+), 119 deletions(-)
diff --git a/src/views/cost_projects/index.vue b/src/views/cost_projects/index.vue
index bac48c7..2d4c59f 100644
--- a/src/views/cost_projects/index.vue
+++ b/src/views/cost_projects/index.vue
@@ -54,8 +54,6 @@
<dict-value :options="dictData.cost_consultation_industry_nature" :value="row.industry" />
</template>
</el-table-column>
- <!-- <el-table-column label="所在市区" prop="city" show-overflow-tooltip />
- <el-table-column label="具体地址" prop="address" show-overflow-tooltip /> -->
<el-table-column label="计划开始日期" prop="starting" show-overflow-tooltip />
<el-table-column label="计划结束日期" prop="endtime" show-overflow-tooltip />
<el-table-column label="计划工期（天）" prop="jhgq" show-overflow-tooltip />
diff --git a/src/views/manage_monthly_progress_report/index.vue b/src/views/manage_monthly_progress_report/index.vue
index 7f430d8..548cfea 100644
--- a/src/views/manage_monthly_progress_report/index.vue
+++ b/src/views/manage_monthly_progress_report/index.vue
@@ -1,16 +1,16 @@
<template>
<div>
- <el-card class="!border-none mb-4" shadow="never">
+ <!-- <el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
- <!-- <el-form-item label="项目id" prop="project_id">
+ <el-form-item label="项目id" prop="project_id">
<el-input class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请输入项目id" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
- </el-form-item> -->
+ </el-form-item>
</el-form>
- </el-card>
+ </el-card> -->
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['manage_progress.manage_monthly_progress_report/add']" type="primary"
@click="handleAdd">
diff --git a/src/views/manage_project/index.vue b/src/views/manage_project/index.vue
index a95c0b0..20c38e6 100644
--- a/src/views/manage_project/index.vue
+++ b/src/views/manage_project/index.vue
@@ -1,47 +1,68 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
- <el-form class="mb-[-16px]" :model="queryParams" inline>
- <el-form-item label="项目名称" prop="project_name">
- <el-input class="w-[280px]" v-model="queryParams.project_name" clearable placeholder="请输入项目名称" />
- </el-form-item>
- <el-form-item label="项目编号" prop="project_code">
- <el-input class="w-[280px]" v-model="queryParams.project_code" clearable placeholder="请输入项目编号" />
- </el-form-item>
- <el-form-item label="性质" prop="nature">
- <el-select class="flex-1" v-model="queryParams.nature" clearable placeholder="请选择性质">
- <el-option v-for="(item, index) in dictData.cost_consultation_industry_nature" :key="index"
- :label="item.name" :value="parseInt(item.value)" />
- </el-select>
- </el-form-item>
- <el-form-item label="行业" prop="industry">
- <el-select class="flex-1" v-model="queryParams.industry" clearable placeholder="请选择行业">
- <el-option v-for="(item, index) in dictData.industry" :key="index" :label="item.name"
- :value="parseInt(item.value)" />
- </el-select>
- </el-form-item>
- <el-form-item label="建设区域" prop="build_area">
- <el-select class="flex-1" v-model="queryParams.build_area" clearable placeholder="请选择建设区域">
- <el-option v-for="(item, index) in dictData.const_area" :key="index" :label="item.name"
- :value="parseInt(item.value)" />
- </el-select>
- </el-form-item>
- <el-form-item label="项目级别" prop="project_level">
- <el-select class="flex-1" v-model="queryParams.project_level" clearable placeholder="请选择项目级别">
- <el-option v-for="(item, index) in dictData.supervision_project_level" :key="index"
- :label="item.name" :value="parseInt(item.value)" />
- </el-select>
- </el-form-item>
- <el-form-item label="工程状态" prop="engineering_status">
- <el-select class="flex-1" v-model="queryParams.engineering_status" clearable placeholder="请选择项目级别">
- <el-option v-for="(item, index) in dictData.engineering_status" :key="index" :label="item.name"
- :value="parseInt(item.value)" />
- </el-select>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" @click="resetPage">查询</el-button>
- <el-button @click="resetParams">重置</el-button>
- </el-form-item>
+ <el-form class="mb-[-16px]" :model="queryParams" label-width="80px">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="项目名称" prop="project_name">
+ <el-input v-model="queryParams.project_name" clearable placeholder="请输入项目名称" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+
+ <el-form-item label="项目编号" prop="project_code">
+ <el-input v-model="queryParams.project_code" clearable placeholder="请输入项目编号" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="性质" prop="nature">
+ <el-select class="flex-1" v-model="queryParams.nature" clearable placeholder="请选择性质">
+ <el-option v-for="(item, index) in dictData.cost_consultation_industry_nature"
+ :key="index" :label="item.name" :value="parseInt(item.value)" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="行业" prop="industry">
+ <el-select class="flex-1" v-model="queryParams.industry" clearable placeholder="请选择行业">
+ <el-option v-for="(item, index) in dictData.industry" :key="index" :label="item.name"
+ :value="parseInt(item.value)" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="建设区域" prop="build_area">
+ <el-select class="flex-1" v-model="queryParams.build_area" clearable placeholder="请选择建设区域">
+ <el-option v-for="(item, index) in dictData.const_area" :key="index" :label="item.name"
+ :value="parseInt(item.value)" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="项目级别" prop="project_level">
+ <el-select class="flex-1" v-model="queryParams.project_level" clearable
+ placeholder="请选择项目级别">
+ <el-option v-for="(item, index) in dictData.supervision_project_level" :key="index"
+ :label="item.name" :value="parseInt(item.value)" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="工程状态" prop="engineering_status">
+ <el-select class="flex-1" v-model="queryParams.engineering_status" clearable
+ placeholder="请选择项目级别">
+ <el-option v-for="(item, index) in dictData.engineering_status" :key="index"
+ :label="item.name" :value="parseInt(item.value)" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item>
+ <el-button type="primary" @click="resetPage">查询</el-button>
+ <el-button @click="resetParams">重置</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
diff --git a/src/views/project_rectification/index.vue b/src/views/project_rectification/index.vue
index 0c3895b..6e53857 100644
--- a/src/views/project_rectification/index.vue
+++ b/src/views/project_rectification/index.vue
@@ -1,32 +1,44 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
- <el-form class="mb-[-16px]" :model="queryParams" inline>
- <el-form-item label="所属项目" prop="cost_project_id">
- <el-select v-model="queryParams.project_id" remote filterable :remote-method="queryCostProject"
- :loading="loading" class="flex-1">
- <el-option v-for="(item, index) in optionsData.projectList" :key="index"
- :label="item.projectinfo" :value="item.id" />
- </el-select>
- </el-form-item>
- <el-form-item label="单据编号" prop="num">
- <el-input class="w-[280px]" v-model="queryParams.num" clearable placeholder="请输入单据编号" />
- </el-form-item>
- <el-form-item label="委托单位" prop="wt_unit">
- <el-input class="w-[280px]" v-model="queryParams.wt_unit" clearable placeholder="请输入委托单位" />
- </el-form-item>
- <el-form-item label="项目负责人" prop="xm_master">
- <el-input class="w-[280px]" v-model="queryParams.xm_master" clearable placeholder="请输入项目负责人" />
- </el-form-item>
- <el-form-item label="项目整改人" prop="zg_master">
- <el-input class="w-[280px]" v-model="queryParams.zg_master" clearable placeholder="请输入项目整改人" />
- </el-form-item>
- <el-form-item>
- <el-button type="primary" @click="resetPage">查询</el-button>
- <el-button @click="resetParams">重置</el-button>
- <export-data class="ml-2.5" :fetch-fun="apiProjectRectificationLists" :params="queryParams"
- :page-size="pager.size" />
- </el-form-item>
+ <el-form class="mb-[-16px]" :model="queryParams" label-width="100px">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="所属项目">
+ <select-remote :formData="queryParams" model="cost_project_id"
+ :api="apiCostProjectDatas"></select-remote>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="单据编号">
+ <el-input v-model="queryParams.num" clearable placeholder="请输入单据编号" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="委托单位">
+ <el-input v-model="queryParams.wt_unit" clearable placeholder="请输入委托单位" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="项目负责人">
+ <el-input v-model="queryParams.xm_master" clearable placeholder="请输入项目负责人" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="项目整改人">
+ <el-input v-model="queryParams.zg_master" clearable placeholder="请输入项目整改人" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item>
+ <el-button type="primary" @click="resetPage">查询</el-button>
+ <el-button @click="resetParams">重置</el-button>
+ <export-data class="ml-2.5" :fetch-fun="apiProjectRectificationLists" :params="queryParams"
+ :page-size="pager.size" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
@@ -81,34 +93,14 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiProjectRectificationLists, apiProjectRectificationDelete, apiProjectRectificationDetail } from '@/api/project_rectification'
-import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import { apiCostProjectDatas } from "@/api/cost_project";
-import { useDictOptions } from "@/hooks/useDictOptions"
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
// 是否显示编辑框
const showEdit = ref(false)
-const loading = ref(false)
-const queryCostProject = async (query: string) => {
- loading.value = true
- const projectList = await apiCostProjectDatas({
- name: query ?? ''
- })
- optionsData.projectList = projectList
- loading.value = false
-}
-
-
-const { optionsData } = useDictOptions<{
- projectList: any[]
-}>({
- projectList: {
- api: apiCostProjectDatas,
- }
-})
// 查询条件
const queryParams = reactive({
diff --git a/src/views/supervision_large_mechanical_equipment/index.vue b/src/views/supervision_large_mechanical_equipment/index.vue
index 9ffd494..01cf156 100644
--- a/src/views/supervision_large_mechanical_equipment/index.vue
+++ b/src/views/supervision_large_mechanical_equipment/index.vue
@@ -1,25 +1,38 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
- <el-form class="mb-[-16px]" :model="queryParams" inline>
- <el-form-item label="序号" prop="sn">
- <el-input class="w-[280px]" v-model="queryParams.sn" clearable placeholder="请输入序号" />
- </el-form-item>
- <el-form-item label="大型机械设备及仪器具" prop="name">
- <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入大型机械设备及仪器具" />
- </el-form-item>
- <el-form-item label="使用部位" prop="use_site">
- <el-input class="w-[280px]" v-model="queryParams.use_site" clearable placeholder="请输入使用部位" />
- </el-form-item>
- <el-form-item label="报审结果" prop="approval_result">
- <el-input class="w-[280px]" v-model="queryParams.approval_result" clearable placeholder="请输入报审结果" />
- </el-form-item>
- <el-form-item label="报审类型" prop="approval_type">
- <el-select class="flex-1" v-model="queryParams.approval_type" clearable placeholder="请选择报审类型">
- <el-option v-for="(item, index) in dictData.approval_type" :key="index" :label="item.name"
- :value="parseInt(item.value)" />
- </el-select>
- </el-form-item>
+ <el-form class="mb-[-16px]" :model="queryParams" label-width="80px">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="序号" prop="sn">
+ <el-input v-model="queryParams.sn" clearable placeholder="请输入序号" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="大型机械设备及仪器具" prop="name" label-width="180px">
+ <el-input v-model="queryParams.name" clearable placeholder="请输入大型机械设备及仪器具" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="使用部位" prop="use_site">
+ <el-input v-model="queryParams.use_site" clearable placeholder="请输入使用部位" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="报审结果" prop="approval_result">
+ <el-input v-model="queryParams.approval_result" clearable placeholder="请输入报审结果" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="报审类型" prop="approval_type">
+ <el-select class="flex-1" v-model="queryParams.approval_type" clearable
+ placeholder="请选择报审类型">
+ <el-option v-for="(item, index) in dictData.approval_type" :key="index"
+ :label="item.name" :value="parseInt(item.value)" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
diff --git a/src/views/supervision_test_blocks_specimens/index.vue b/src/views/supervision_test_blocks_specimens/index.vue
index 893ef2d..b5d2c61 100644
--- a/src/views/supervision_test_blocks_specimens/index.vue
+++ b/src/views/supervision_test_blocks_specimens/index.vue
@@ -1,28 +1,26 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
- <el-form class="mb-[-16px]" :model="queryParams" inline>
+ <el-form class="mb-[-16px]" :model="queryParams" label-width="80px">
<el-row>
<el-col :span="6">
<el-form-item label="试验类型" prop="test_type">
- <el-input class="w-[280px]" v-model="queryParams.test_type" clearable
- placeholder="请输入试验类型" />
+ <el-input v-model="queryParams.test_type" clearable placeholder="请输入试验类型" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="编号" prop="code">
- <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入编号" />
+ <el-input v-model="queryParams.code" clearable placeholder="请输入编号" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="见证人" prop="witness">
- <el-input class="w-[280px]" v-model="queryParams.witness" clearable placeholder="请输入见证人" />
+ <el-input v-model="queryParams.witness" clearable placeholder="请输入见证人" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="试验部位" prop="test_site">
- <el-input class="w-[280px]" v-model="queryParams.test_site" clearable
- placeholder="请输入试验部位" />
+ <el-input v-model="queryParams.test_site" clearable placeholder="请输入试验部位" />
</el-form-item>
</el-col>
<el-col :span="6">