sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

dev_xds
haha 2024-04-28 00:46:33 +08:00
parent 72b976a06d
commit 937078db0e
6 changed files with 449 additions and 398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue
View File

@ -106,37 +106,68 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
</el-tabs>
<el-dialog :title="title" v-if="open" :visible.sync="open" width="680px" append-to-body
<el-dialog :title="title" v-if="open" :visible.sync="open" width="900px" append-to-body custom-class="prj-checking-detection-drawer-dlg"
:close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="项目名称" prop="projectName">
<el-row>
<el-col :span="12">
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
</el-form-item>
<el-form-item label="单位名称" prop="deptName">
</el-col>
<el-col :span="12">
<el-form-item label="单位名称" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入单位名称" :disabled="true" />
</el-form-item>
<el-form-item label="送检类型" prop="checkType">
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="送检类型" prop="checkType">
<el-select v-model="form.checkType" placeholder="请选择送检类型" style="width: 100%">
<el-option v-for="dict in dict.type.check_detection_check_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="材料名称" prop="materialName">
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="材料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入材料名称" />
</el-form-item>
<el-form-item label="使用部位" prop="usePosition">
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="使用部位" prop="usePosition">
<el-input v-model="form.usePosition" placeholder="请输入使用部位" />
</el-form-item>
<el-form-item label="取样数量" prop="sampleNum">
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="取样数量" prop="sampleNum">
<el-input v-model="form.sampleNum" placeholder="请输入取样数量" />
</el-form-item>
<el-form-item label="提供合格证" prop="qualifiedFlag">
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="提供合格证" prop="qualifiedFlag">
<el-select v-model="form.qualifiedFlag" placeholder="请选择提供合格证" style="width: 100%">
<el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="监理专员" prop="witnessUser">
</el-col>
<el-col :span="12">
<el-form-item label="监理专员" prop="witnessUser">
<el-select v-model="form.witnessUser" placeholder="请选择监理专员" filterable style="width: 100%"
@change="selectWitnessUser">
<el-option-group v-for="group in deptUserData" :key="group.unitId + ''"
@ -147,16 +178,50 @@
</el-option-group>
</el-select>
</el-form-item>
<el-form-item label="实验室名称" prop="laboratoryName">
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="实验室名称" prop="laboratoryName">
<el-input v-model="form.laboratoryName" placeholder="请输入实验室名称" />
</el-form-item>
<el-form-item label="送检时间" prop="checkTime">
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="委托单" prop="trustDeed" :class="form.trustDeed?'img-1':''">
<image-upload v-model="form.trustDeed" :limit="1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="样品照片" prop="specimenPhoto" :class="form.specimenPhoto?'img-1':''">
<image-upload v-model="form.specimenPhoto" :limit="1" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="送检时间" prop="checkTime">
<el-date-picker clearable v-model="form.checkTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择送检时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="附件" prop="attachmentFiles" class="mg-b-8">
<FileUpload :limit="10" v-model="form.attachmentFiles" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
@ -278,6 +343,12 @@ export default {
qualifiedFlag: [
{ required: true, message: "请选择是否提供合格证", trigger: "blur" },
],
trustDeed:[
{required:true,message:'请上传委托单',trigger:"blur"}
],
specimenPhoto:[
{required:true,message:'请上传样品照片',trigger:"blur"}
],
witnessUser: [
{ required: true, message: "请选择监理单位监理专员", trigger: "blur" },
],
@ -400,13 +471,19 @@ export default {
this.files = [];
this.resetForm("form");
},
getDeptName(){
let tmps=this.nodes.filter(d=>d.deptId==+this.unitActiveName);
return tmps.length>0?tmps[0].deptName:"";
},
/** 新增按钮操作 */
handleAdd() {
debugger
this.reset();
this.credential = false;
this.form.projectId = this.project.id;
this.form.projectName = this.project.projectName;
this.form.deptId = this.unitActiveName;
this.form.deptName=this.getDeptName();
this.open = true;
this.title = "添加材料取样复试";
//查询单位人员
@ -430,7 +507,14 @@ export default {
this.reset();
const id = row.id || this.ids;
getCheckDetection(id).then((response) => {
this.form = response.data;
let obj= response.data;
obj.attachmentFiles=this.$tryToJson(obj.attachment||'[]',[]).map(d=>{
return {
name:d,
url:d
}
});
this.form = obj;
this.files = this.form.credentialFile;
this.open = true;
this.title = "修改项目特种人员";
@ -458,6 +542,7 @@ export default {
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
this.form.attachment=this.form.attachmentFiles?JSON.stringify(this.form.attachmentFiles.map(d=>d.url)):"[]";
if (this.form.id) {
//已经上传过检测结果时，修改重新发起提交申请
if (this.form.checkState == "2") {
@ -533,3 +618,47 @@ export default {
},
};
</script>
<style lang="scss">
.prj-checking-detection-drawer-dlg{
.el-dialog__body{
padding:0px 10px;
.el-form-item{
margin-bottom: 16px;
&.mg-b-8{
margin-bottom: 8px;
}
&.img-1{
.el-upload--picture-card{
display: none;
}
.el-upload__tip{
display: none;
}
}
.upload-file {
.upload-file-uploader{
display: flex;
align-items: center;
margin-bottom: 0px;
line-height: 30px;
.el-upload__tip{
margin-left: 8px;
}
}
}
.el-form-item__error{
z-index: 9;
margin-top:-4px;
}
.upload-file-list {
max-height: 120px;
overflow-y: auto;
padding-right:30px;
.el-upload-list__item{
margin-bottom: 0px !important;
}
}
}
}
}
</style>

618
ruoyi-ui/src/views/project/checkDetection/index.vue
View File

@ -1,37 +1,16 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="queryParams.projectName"
placeholder="请输入项目名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="单位名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入单位名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.deptName" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="送检类型" prop="checkType">
<el-select v-model="queryParams.checkType" placeholder="请选择送检类型" clearable>
<el-option
v-for="dict in dict.type.check_detection_check_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option v-for="dict in dict.type.check_detection_check_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<!-- <el-form-item label="检测结果" prop="detectionResult">
@ -49,72 +28,38 @@
</el-select>
</el-form-item> -->
<el-form-item label="材料名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
placeholder="请输入材料名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.materialName" placeholder="请输入材料名称" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="送检时间">
<el-date-picker
v-model="daterangeCheckTime"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
<el-date-picker v-model="daterangeCheckTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item label="审批状态" prop="approveStatus" v-if="false">
<el-select
v-model="queryParams.approveStatus"
placeholder="请选择审批状态"
clearable
>
<el-option
v-for="dict in dict.type.project_check_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-select v-model="queryParams.approveStatus" placeholder="请选择审批状态" clearable>
<el-option v-for="dict in dict.type.project_check_status" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="使用部位" prop="usePosition">
<el-input
v-model="queryParams.usePosition"
placeholder="请输入使用部位"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.usePosition" placeholder="请输入使用部位" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="监理专员" prop="witnessUserName">
<el-input
v-model="queryParams.witnessUserName"
placeholder="请输入监理专员名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.witnessUserName" placeholder="请输入监理专员名称" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="实验室" prop="laboratoryName">
<el-input
v-model="queryParams.laboratoryName"
placeholder="请输入实验室名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.laboratoryName" placeholder="请输入实验室名称" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
>搜索</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- <el-row :gutter="10" class="mb8"> -->
<!-- <el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
@ -125,7 +70,7 @@
>新增</el-button
>
</el-col> -->
<!-- <el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="success"
plain
@ -165,84 +110,35 @@
<el-tabs type="card" v-model="queryParams.activeName" @tab-click="getList">
<el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
<el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
<el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane
></el-tabs>
<el-table
v-loading="loading"
:data="checkDetectionList"
@selection-change="handleSelectionChange" stripe
>
<el-table-column
label="项目名称"
align="center"
prop="projectName"
width="200"
>
<el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane></el-tabs>
<el-table v-loading="loading" :data="checkDetectionList" @selection-change="handleSelectionChange" stripe>
<el-table-column label="项目名称" align="center" prop="projectName" width="200">
<template slot-scope="scope">
<div>{{ scope.row.projectName }}</div>
</template>
</el-table-column>
<el-table-column
label="单位名称"
align="center"
prop="deptName"
width="180"
show-overflow-tooltip
/>
<el-table-column label="单位名称" align="center" prop="deptName" width="180" show-overflow-tooltip />
<el-table-column label="送检类型" align="center" prop="checkType">
<template slot-scope="scope">
<dict-tag
:options="dict.type.check_detection_check_type"
:value="scope.row.checkType"
/>
<dict-tag :options="dict.type.check_detection_check_type" :value="scope.row.checkType" />
</template>
</el-table-column>
<el-table-column
label="材料名称"
align="center"
prop="materialName"
width="100"
show-overflow-tooltip
/>
<el-table-column
label="使用部位"
align="center"
prop="usePosition"
width="120"
show-overflow-tooltip
/>
<el-table-column
label="取样数量"
align="center"
prop="sampleNum"
width="80"
show-overflow-tooltip
/>
<el-table-column label="材料名称" align="center" prop="materialName" width="100" show-overflow-tooltip />
<el-table-column label="使用部位" align="center" prop="usePosition" width="120" show-overflow-tooltip />
<el-table-column label="取样数量" align="center" prop="sampleNum" width="80" show-overflow-tooltip />
<el-table-column label="合格证" align="center" prop="qualifiedFlag">
<template slot-scope="scope">
<el-tag v-if="scope.row.qualifiedFlag == 'Y'" type="success">已提供</el-tag>
<el-tag v-if="scope.row.qualifiedFlag == 'N'" type="danger">未提供</el-tag>
</template>
</el-table-column>
<el-table-column
label="监理专员"
align="left"
prop="witnessUser"
width="140"
show-overflow-tooltip
>
<el-table-column label="监理专员" align="left" prop="witnessUser" width="140" show-overflow-tooltip>
<template slot-scope="scope">
<div>{{ scope.row.witnessUserName }}</div>
<div>{{ scope.row.witnessUser }}</div>
</template>
</el-table-column>
<el-table-column
label="实验室名称"
align="center"
prop="laboratoryName"
width="150"
show-overflow-tooltip
/>
<el-table-column label="实验室名称" align="center" prop="laboratoryName" width="150" show-overflow-tooltip />
<el-table-column label="送检时间" align="center" prop="checkTime" width="95">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
@ -258,10 +154,7 @@
</el-table-column> -->
<el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
<template slot-scope="scope">
<dict-tag
:options="dict.type.project_check_status"
:value="scope.row.approveStatus"
/>
<dict-tag :options="dict.type.project_check_status" :value="scope.row.approveStatus" />
</template>
</el-table-column>
<el-table-column label="提交用户" align="center" prop="createBy" width="110" />
@ -278,261 +171,183 @@
</el-table-column>
<el-table-column label="检测报告" align="center" prop="updateTime" width="80">
<template slot-scope="scope">
<el-button
v-if="scope.row.checkState == '2'"
size="mini"
type="text"
icon="el-icon-paperclip"
@click="handledownload(scope.row)"
v-hasPermi="['project:surProjectSpecial:list']"
>下载检测报告</el-button
>
<el-button v-if="scope.row.checkState == '2'" size="mini" type="text" icon="el-icon-paperclip"
@click="handledownload(scope.row)" v-hasPermi="['project:surProjectSpecial:list']">下载检测报告</el-button>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
fixed="right"
class-name="small-padding fixed-width"
width="200"
>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="200">
<template slot-scope="scope">
<el-button
v-if="scope.row.checkState == '1'"
size="mini"
type="text"
icon="el-icon-edit-outline"
@click="handleUpdateResult(scope.row)"
style="margin-left: 8px"
v-hasPermi="['project:checkDetection:editResult']"
>登记检测结果</el-button
>
<el-button
v-if="scope.row.approveStatus != null"
size="mini"
type="text"
icon="el-icon-tickets"
@click="handleAuditinfo(scope.row)"
>审批日志</el-button
>
<el-button
v-if="scope.row.approveStatus == '1'"
size="mini"
type="text"
icon="el-icon-finished"
v-hasPermi="['project:checkDetection:approve']"
@click="handleAudit(scope.row)"
>处理审批</el-button
>
<el-button
v-if="scope.row.checkState == '1'"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['project:checkDetection:edit']"
>修改</el-button
>
<el-button
v-if="scope.row.approveStatus != '4'"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['project:checkDetection:remove']"
>删除</el-button
>
<el-button v-if="scope.row.checkState == '1'" size="mini" type="text" icon="el-icon-edit-outline"
@click="handleUpdateResult(scope.row)" style="margin-left: 8px"
v-hasPermi="['project:checkDetection:editResult']">登记检测结果</el-button>
<el-button v-if="scope.row.approveStatus != null" size="mini" type="text" icon="el-icon-tickets"
@click="handleAuditinfo(scope.row)">审批日志</el-button>
<el-button v-if="scope.row.approveStatus == '1'" size="mini" type="text" icon="el-icon-finished"
v-hasPermi="['project:checkDetection:approve']" @click="handleAudit(scope.row)">处理审批</el-button>
<el-button v-if="scope.row.checkState == '1'" size="mini" type="text" icon="el-icon-edit"
@click="handleUpdate(scope.row)" v-hasPermi="['project:checkDetection:edit']">修改</el-button>
<el-button v-if="scope.row.approveStatus != '4'" size="mini" type="text" icon="el-icon-delete"
@click="handleDelete(scope.row)" v-hasPermi="['project:checkDetection:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改材料取样复试对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body :close-on-click-modal="false" custom-class="prj-checking-detection-dlg"
:close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="form.projectName"
placeholder="请输入项目名称"
:disabled="true"
/>
</el-form-item>
<el-form-item label="单位名称" prop="deptName">
<el-input
v-model="form.deptName"
placeholder="请输入单位名称"
:disabled="true"
/>
</el-form-item>
<el-form-item label="送检类型" prop="checkType">
<el-select
v-model="form.checkType"
placeholder="请选择送检类型"
style="width: 100%"
>
<el-option
v-for="dict in dict.type.check_detection_check_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="材料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入材料名称" />
</el-form-item>
<el-form-item label="使用部位" prop="usePosition">
<el-input v-model="form.usePosition" placeholder="请输入使用部位" />
</el-form-item>
<el-form-item label="取样数量" prop="sampleNum">
<el-input v-model="form.sampleNum" placeholder="请输入取样数量" />
</el-form-item>
<el-form-item label="提供合格证" prop="qualifiedFlag">
<el-select
v-model="form.qualifiedFlag"
placeholder="请选择提供合格证"
style="width: 100%"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="监理专员" prop="witnessUser">
<el-select
v-model="form.witnessUser"
placeholder="请选择监理专员"
filterable
style="width: 100%"
@change="selectWitnessUser"
>
<el-option-group
v-for="group in deptUserData"
:key="group.unitId + ''"
:label="group.unitName + ' [' + group.unitTypeName + '] '"
>
<el-option
v-for="item in group.userinfoList"
:key="item.phonenumber"
:label="item.nickName + ' [' + item.jobTypeName + '] '"
:value="item.phonenumber"
>
</el-option>
</el-option-group>
</el-select>
</el-form-item>
<el-form-item label="实验室名称" prop="laboratoryName">
<el-input v-model="form.laboratoryName" placeholder="请输入实验室名称" />
</el-form-item>
<el-form-item label="送检时间" prop="checkTime">
<el-date-picker
clearable
v-model="form.checkTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择送检时间"
>
</el-date-picker>
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="项目名称" prop="projectName" class="mg-b-8">
<el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="单位名称" prop="deptName" class="mg-b-8">
<el-input v-model="form.deptName" placeholder="请输入单位名称" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="送检类型" prop="checkType">
<el-select v-model="form.checkType" placeholder="请选择送检类型" style="width: 100%">
<el-option v-for="dict in dict.type.check_detection_check_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="材料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入材料名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="使用部位" prop="usePosition">
<el-input v-model="form.usePosition" placeholder="请输入使用部位" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="取样数量" prop="sampleNum">
<el-input v-model="form.sampleNum" placeholder="请输入取样数量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-form-item label="提供合格证" prop="qualifiedFlag">
<el-select v-model="form.qualifiedFlag" placeholder="请选择提供合格证" style="width: 100%">
<el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="监理专员" prop="witnessUser">
<el-select v-model="form.witnessUser" placeholder="请选择监理专员" filterable style="width: 100%"
@change="selectWitnessUser">
<el-option-group v-for="group in deptUserData" :key="group.unitId + ''"
:label="group.unitName + ' [' + group.unitTypeName + '] '">
<el-option v-for="item in group.userinfoList" :key="item.phonenumber"
:label="item.nickName + ' [' + item.jobTypeName + '] '" :value="item.phonenumber">
</el-option>
</el-option-group>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="实验室名称" prop="laboratoryName">
<el-input v-model="form.laboratoryName" placeholder="请输入实验室名称" />
</el-form-item></el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="委托单" prop="trustDeed" :class="form.trustDeed?'img-1':''">
<image-upload v-model="form.trustDeed" :limit="1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="样品照片" prop="specimenPhoto" :class="form.specimenPhoto?'img-1':''">
<image-upload v-model="form.specimenPhoto" :limit="1" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="送检时间" prop="checkTime">
<el-date-picker clearable v-model="form.checkTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择送检时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="附件" prop="attachmentFiles" class="mg-b-8">
<FileUpload :limit="10" v-model="form.attachmentFiles" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 材料取样复试等级结果 -->
<el-dialog
:title="title"
v-if="resultopen"
:visible.sync="resultopen"
width="680px"
append-to-body :close-on-click-modal="false" :close-on-press-escape="false"
>
<el-form
ref="resultform"
:model="resultform"
:rules="resultrules"
label-width="100px"
>
<el-dialog :title="title" v-if="resultopen" :visible.sync="resultopen" width="680px" append-to-body
:close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="resultform" :model="resultform" :rules="resultrules" label-width="100px">
<el-form-item label="项目名称">
<el-input
v-model="resultform.projectName"
placeholder="请输入项目名称"
:disabled="true"
/>
<el-input v-model="resultform.projectName" placeholder="请输入项目名称" :disabled="true" />
</el-form-item>
<el-form-item label="单位名称">
<el-input
v-model="resultform.deptName"
placeholder="请输入单位名称"
:disabled="true"
/>
<el-input v-model="resultform.deptName" placeholder="请输入单位名称" :disabled="true" />
</el-form-item>
<el-form-item label="送检类型">
<el-select
v-model="resultform.checkType"
placeholder="请选择送检类型"
style="width: 100%"
:disabled="true"
>
<el-option
v-for="dict in dict.type.check_detection_check_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-select v-model="resultform.checkType" placeholder="请选择送检类型" style="width: 100%" :disabled="true">
<el-option v-for="dict in dict.type.check_detection_check_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="材料名称">
<el-input
v-model="resultform.materialName"
placeholder="请输入材料名称"
:disabled="true"
/>
<el-input v-model="resultform.materialName" placeholder="请输入材料名称" :disabled="true" />
</el-form-item>
<el-form-item label="实验室名称">
<el-input
v-model="resultform.laboratoryName"
placeholder="请输入实验室名称"
:disabled="true"
/>
<el-input v-model="resultform.laboratoryName" placeholder="请输入实验室名称" :disabled="true" />
</el-form-item>
<el-form-item label="送检时间">
<el-input
v-model="resultform.checkTime"
placeholder="请输入实送检时间"
:disabled="true"
/>
<el-input v-model="resultform.checkTime" placeholder="请输入实送检时间" :disabled="true" />
</el-form-item>
<el-form-item label="检测结果" prop="detectionResult" v-if="false">
<el-radio
v-model="resultform.detectionResult"
v-for="dict in dict.type.project_checking_result"
:label="dict.value"
:key="dict.value"
border
size="small"
>{{ dict.label }}</el-radio
>
<el-radio v-model="resultform.detectionResult" v-for="dict in dict.type.project_checking_result"
:label="dict.value" :key="dict.value" border size="small">{{ dict.label }}</el-radio>
</el-form-item>
<el-form-item label="检测报告" prop="detectionFile">
<FileUpload
v-model="resultform.detectionFile"
:limit="2"
@input="fileInput"
:fileType="['pdf', 'png', 'jpg', 'jpeg']"
/>
<FileUpload v-model="resultform.detectionFile" :limit="2" @input="fileInput"
:fileType="['pdf', 'png', 'jpg', 'jpeg']" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -540,8 +355,8 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<indexDrawer ref="indexDrawer"/>
<approveCheckDetectionDrawer ref="approveCheckDetectionDrawer" :closeCallBack="getList"/>
<indexDrawer ref="indexDrawer" />
<approveCheckDetectionDrawer ref="approveCheckDetectionDrawer" :closeCallBack="getList" />
</div>
</template>
@ -564,7 +379,7 @@ export default {
indexDrawer,
approveCheckDetectionDrawer,
},
dicts: ["sys_yes_no","project_check_status", "project_checking_result", "check_detection_check_type"],
dicts: ["sys_yes_no", "project_check_status", "project_checking_result", "check_detection_check_type"],
data() {
return {
// 遮罩层
@ -607,7 +422,7 @@ export default {
checkState: null,
detectionResult: null,
activeName: "jxz",
approveStatus:null,
approveStatus: null,
},
// 表单参数
form: {},
@ -635,6 +450,12 @@ export default {
qualifiedFlag: [
{ required: true, message: "请选择是否提供合格证", trigger: "blur" },
],
trustDeed:[
{required:true,message:'请上传委托单',trigger:"blur"}
],
specimenPhoto:[
{required:true,message:'请上传样品照片',trigger:"blur"}
],
witnessUser: [
{ required: true, message: "请选择监理单位监理专员", trigger: "blur" },
],
@ -681,7 +502,10 @@ export default {
}
this.queryCount(this.queryParams);
listCheckDetection(this.queryParams).then((response) => {
this.checkDetectionList = response.rows;
this.checkDetectionList = (response.rows||[]).map(d=>{
d.attachmentFiles=this.$tryToJson(d.attachment,[]);
return d;
});
this.total = response.total;
this.loading = false;
});
@ -758,7 +582,14 @@ export default {
this.reset();
const id = row.id || this.ids;
getCheckDetection(id).then((response) => {
this.form = response.data;
let obj= response.data;
obj.attachmentFiles=this.$tryToJson(obj.attachment||'[]',[]).map(d=>{
return {
name:d,
url:d
}
});
this.form =obj;
this.open = true;
this.title = "修改材料取样复试";
});
@ -785,6 +616,7 @@ export default {
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
this.form.attachment=this.form.attachmentFiles?JSON.stringify(this.form.attachmentFiles.map(d=>d.url)):"[]";
if (this.form.id != null) {
updateCheckDetection(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
@ -828,7 +660,7 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
.catch(() => { });
},
/** 导出按钮操作 */
handleExport() {
@ -859,15 +691,59 @@ export default {
},
/** 审批日志 */
handleAuditinfo(row) {
row.title="材料取样复试";
row.logType="1";
row.title = "材料取样复试";
row.logType = "1";
this.$refs.indexDrawer.show(row);
},
/** 处理审批 */
handleAudit(row){
row.typeName="材料封样";
handleAudit(row) {
row.typeName = "材料封样";
this.$refs.approveCheckDetectionDrawer.show(row);
}
},
};
</script>
<style lang="scss">
.prj-checking-detection-dlg{
.el-dialog__body{
padding:0px 10px;
.el-form-item{
margin-bottom: 16px;
&.mg-b-8{
margin-bottom: 8px;
}
&.img-1{
.el-upload--picture-card{
display: none;
}
.el-upload__tip{
display: none;
}
}
.upload-file {
.upload-file-uploader{
display: flex;
align-items: center;
margin-bottom: 0px;
line-height: 30px;
.el-upload__tip{
margin-left: 8px;
}
}
}
.el-form-item__error{
z-index: 9;
margin-top:-4px;
}
.upload-file-list {
max-height: 120px;
overflow-y: auto;
padding-right:30px;
.el-upload-list__item{
margin-bottom: 0px !important;
}
}
}
}
}
</style>

13
ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
View File

@ -206,7 +206,7 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="附件" prop="trainFile" class="mg-b-8">
<el-form-item label="附件" prop="files" class="mg-b-8">
<FileUpload :limit="10" v-model="form.files" />
</el-form-item>
</el-col>
@ -572,6 +572,17 @@ export default {
z-index: 9;
margin-top:-4px;
}
.upload-file {
.upload-file-uploader{
display: flex;
align-items: center;
margin-bottom: 0px;
line-height: 30px;
.el-upload__tip{
margin-left: 8px;
}
}
}
.upload-file-list {
max-height: 120px;
overflow-y: auto;

14
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java
View File

@ -4,6 +4,7 @@ package com.yanzhu.jh.bigscreen.web.controller;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.sign.Md5Utils;
@ -58,22 +59,15 @@ public class ProjectCheckDetectionController extends BaseController {
* @return
*/
@PostMapping("/getList")
public AjaxResult getList(@RequestBody SurProjectCheckDetection where){
public TableDataInfo getList(@RequestBody SurProjectCheckDetection where){
Long deptId= where.getDeptId();
if(deptId==null || deptId<=0){
if (SecurityUtils.isUserB()) {
where.setPrjIds(getProjectIds());
}
}
String key="bgscreen_checkDetection_getList_"+where.getCheckType()+"_"+where.getDeptId()+"_"+where.getProjectId()+where
.getProType()+ Md5Utils.hash(where.getPrjIds());
Object obj=redisCache.getCacheObject(key);
if(obj!=null){
return AjaxResult.success(obj);
}
startPage();
List<SurProjectCheckDetection> list=checkDetectionService.getList(where);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(list);
return getDataTable(list);
}
}

28
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java
View File

@ -93,6 +93,34 @@ public class SurProjectCheckDetection extends BaseEntity
@Excel(name = "数据状态")
private String isDel;
private String attachment;
private String trustDeed;
public String getAttachment() {
return attachment;
}
public void setAttachment(String attachment) {
this.attachment = attachment;
}
public String getTrustDeed() {
return trustDeed;
}
public void setTrustDeed(String trustDeed) {
this.trustDeed = trustDeed;
}
public String getSpecimenPhoto() {
return specimenPhoto;
}
public void setSpecimenPhoto(String specimenPhoto) {
this.specimenPhoto = specimenPhoto;
}
private String specimenPhoto;
/** 审核状态 */
@Excel(name = "审核状态")
private String approveStatus;

15
yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
View File

@ -35,10 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createByName" column="create_by_name"/>
<result property="updateByName" column="update_by_name"/>
<result property="approveStatus" column="approve_status"/>
<result property="attachment" column="attachment"/>
<result property="trustDeed" column="trust_deed"/>
<result property="specimenPhoto" column="specimen_photo"/>
</resultMap>
<sql id="selectSurProjectCheckDetectionVo">
SELECT spcd.id, spcd.project_id, sp.projectName, spcd.dept_id, sd.dept_name, spcd.check_type, sdd.dict_label AS check_type_name, spcd.material_name, spcd.use_position, spcd.sample_num, spcd.qualified_flag, spcd.represen_num, spcd.sample_user, spcd.sample_user_name, spcd.witness_user, spcd.witness_user_name, spcd.laboratory_name, spcd.check_time, spcd.check_state, spcd.detection_result, spcd.detection_file, spcd.create_by, spcd.create_time, spcd.is_del, spcd.update_by, spcd.update_time, spcd.remark, spcd.approve_status, u1.nick_name create_by_name,u2.nick_name update_by_name
SELECT spcd.id, spcd.project_id, sp.projectName, spcd.dept_id, sd.dept_name, spcd.check_type, sdd.dict_label AS check_type_name, spcd.material_name, spcd.use_position, spcd.sample_num, spcd.qualified_flag, spcd.represen_num, spcd.sample_user, spcd.sample_user_name, spcd.witness_user, spcd.witness_user_name, spcd.laboratory_name, spcd.check_time, spcd.check_state, spcd.detection_result, spcd.detection_file, spcd.create_by, spcd.create_time, spcd.is_del, spcd.update_by, spcd.update_time, spcd.remark, spcd.approve_status, u1.nick_name create_by_name
,u2.nick_name update_by_name,spcd.attachment,spcd.trust_deed,spcd.specimen_photo
FROM sur_project_check_detection spcd
LEFT JOIN sur_project sp ON spcd.project_id = sp.id
LEFT JOIN sys_dept sd ON sd.dept_id = spcd.dept_id
@ -159,6 +163,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="approveStatus != null">approve_status,</if>
<if test="attachment != null">attachment,</if>
<if test="trustDeed != null">trust_deed,</if>
<if test="specimenPhoto != null">specimen_photo,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="projectId != null">#{projectId},</if>
@ -185,6 +192,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="approveStatus != null">#{approveStatus},</if>
<if test="attachment != null">#{attachment},</if>
<if test="trustDeed != null">#{trustDeed},</if>
<if test="specimenPhoto != null">#{specimenPhoto},</if>
</trim>
</insert>
@ -215,6 +225,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="approveStatus != null">approve_status = #{approveStatus},</if>
<if test="attachment != null">attachment = #{attachment},</if>
<if test="trustDeed != null">trust_deed = #{trustDeed},</if>
<if test="specimenPhoto != null">specimen_photo = #{specimenPhoto},</if>
</trim>
where id = #{id}
</update>