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

提交代码

dev_xds
姜玉琦 2024-03-25 23:39:03 +08:00
parent 0afd1137bb
commit 74b3ae5d72
11 changed files with 952 additions and 886 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue
View File

@ -163,6 +163,7 @@ export default {
//label样式 //label样式
labelStyle: { width: "180px" }, labelStyle: { width: "180px" },
initData: {}, initData: {},
fileTypes:['pdf','png','jpg','jpeg'],
}; };
}, },
computed: {}, computed: {},

2
ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue
View File

@ -53,7 +53,7 @@
<el-form-item label="审批内容" prop="files"> <el-form-item label="审批内容" prop="files">
<FileUpload <FileUpload
@input="fileInput" @input="fileInput"
:limit="9" :limit="18"
v-model="form.files" v-model="form.files"
:fileType="['pdf', 'png', 'jpg', 'jpeg']" :fileType="['pdf', 'png', 'jpg', 'jpeg']"
/> />

2
ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
View File

@ -53,7 +53,7 @@
<el-form-item label="审批内容" prop="files"> <el-form-item label="审批内容" prop="files">
<FileUpload <FileUpload
@input="fileInput" @input="fileInput"
:limit="9" :limit="18"
:fileType="['pdf', 'png', 'jpg', 'jpeg']" :fileType="['pdf', 'png', 'jpg', 'jpeg']"
/> />
</el-form-item> </el-form-item>

66
ruoyi-ui/src/views/project/projectAuditinfo/approveCheckDetectionDrawer.vue
View File

@ -11,9 +11,16 @@
<template slot="title"> <template slot="title">
<div>{{ title + " 【处理审批】" }}</div> <div>{{ title + " 【处理审批】" }}</div>
</template> </template>
<el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;"> <el-form
ref="form"
v-loading="loading"
:model="form"
:rules="rules"
label-width="80px"
style="padding-right: 20px; padding-left: 20px"
>
<el-form-item label="项目名称"> <el-form-item label="项目名称">
{{dataInfo.projectName}} {{ dataInfo.projectName }}
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@ -100,7 +107,7 @@
v-model="form.comment" v-model="form.comment"
/> />
</el-form-item> </el-form-item>
<div style="text-align: center"> <div style="text-align: center;margin-bottom:20px;">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
@ -113,16 +120,13 @@
style="z-index: 2050" style="z-index: 2050"
/> />
</div> </div>
</template> </template>
<script> <script>
import { import { getCheckDetection, updateCheckDetection } from "@/api/project/checkDetection";
getCheckDetection, import ElImageViewer from "element-ui/packages/image/src/image-viewer";
updateCheckDetection,
} from "@/api/project/checkDetection";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
export default { export default {
name: "approveCheckDetectionDrawer", name: "approveCheckDetectionDrawer",
components: { components: {
ElImageViewer, ElImageViewer,
@ -172,17 +176,16 @@
show(options) { show(options) {
this.title = options.typeName; this.title = options.typeName;
this.isOpen = true; this.isOpen = true;
this.form={}; this.form = {};
this.form.id=options.id; this.form.id = options.id;
getCheckDetection(options.id) getCheckDetection(options.id).then((res) => {
.then((res) => {
this.dataInfo = res.data; this.dataInfo = res.data;
this.loading = false; this.loading = false;
}); });
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.isOpen = false;
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
@ -190,25 +193,27 @@
if (valid) { if (valid) {
// 结果状态同步到审批状态 // 结果状态同步到审批状态
let msg = "合格"; let msg = "合格";
if(this.form.detectionResult=="1"){ if (this.form.detectionResult == "1") {
this.form.approveStatus="4"; this.form.approveStatus = "4";
}else{ } else {
msg = "不合格"; msg = "不合格";
this.form.approveStatus="3"; this.form.approveStatus = "3";
} }
this.$confirm('是否确认审批'+msg+'?', '提示', { this.$confirm("是否确认审批" + msg + "?", "提示", {
confirmButtonText: '确定', confirmButtonText: "确定",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning' type: "warning",
}).then(() => { })
this.loading=true; .then(() => {
updateCheckDetection(this.form).then(res => { this.loading = true;
updateCheckDetection(this.form).then((res) => {
this.$modal.msgSuccess("审批成功"); this.$modal.msgSuccess("审批成功");
this.loading = false; this.loading = false;
//关闭并刷新列表 //关闭并刷新列表
this.$refs.drawer.closeDrawer(); this.$refs.drawer.closeDrawer();
}); });
}).catch(() => { })
.catch(() => {
console.log("取消操作"); console.log("取消操作");
}); });
} }
@ -222,6 +227,5 @@
}); });
}, },
}, },
}; };
</script> </script>

77
ruoyi-ui/src/views/project/projectAuditinfo/approveCheckingDrawer.vue
View File

@ -11,14 +11,22 @@
<template slot="title"> <template slot="title">
<div>{{ title + " 【处理审批】" }}</div> <div>{{ title + " 【处理审批】" }}</div>
</template> </template>
<el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;"> <el-form
ref="form"
v-loading="loading"
:model="form"
:rules="rules"
label-width="80px"
style="padding-right: 20px; padding-left: 20px"
>
<el-form-item label="项目名称"> <el-form-item label="项目名称">
{{dataInfo.projectName}} {{ dataInfo.projectName }}
</el-form-item> </el-form-item>
<el-form-item label="验收图片"> <el-form-item label="验收图片">
<el-image <el-image
ref="preview" ref="preview"
v-for="(img,idx) in dataInfo.imageUrls.split(',')" :key="idx" v-for="(img, idx) in dataInfo.imageUrls.split(',')"
:key="idx"
:src="getImageUrl(img)" :src="getImageUrl(img)"
style="width: 120px; height: 120px; margin-right: 15px" style="width: 120px; height: 120px; margin-right: 15px"
@click="onPreview(img)" @click="onPreview(img)"
@ -96,7 +104,7 @@
v-model="form.comment" v-model="form.comment"
/> />
</el-form-item> </el-form-item>
<div style="text-align: center"> <div style="text-align: center;margin-bottom:20px;">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
@ -109,16 +117,13 @@
style="z-index: 2050" style="z-index: 2050"
/> />
</div> </div>
</template> </template>
<script> <script>
import { import { getProjectChecking, updateProjectChecking } from "@/api/project/projectChecking";
getProjectChecking, import ElImageViewer from "element-ui/packages/image/src/image-viewer";
updateProjectChecking,
} from "@/api/project/projectChecking";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
export default { export default {
name: "approveCheckingDrawer", name: "approveCheckingDrawer",
components: { components: {
ElImageViewer, ElImageViewer,
@ -128,14 +133,18 @@
type: Function, type: Function,
}, },
}, },
dicts: ["project_checking_result","project_checking_data_type_lvl1","project_checking_data_type_lvl2"], dicts: [
"project_checking_result",
"project_checking_data_type_lvl1",
"project_checking_data_type_lvl2",
],
data() { data() {
return { return {
showViewer: false, showViewer: false,
open: false, open: false,
isOpen: false, isOpen: false,
dataInfo: { dataInfo: {
imageUrls:"" imageUrls: "",
}, },
title: "", title: "",
form: {}, form: {},
@ -170,17 +179,16 @@
show(options) { show(options) {
this.title = options.typeName; this.title = options.typeName;
this.isOpen = true; this.isOpen = true;
this.form={}; this.form = {};
this.form.id=options.id; this.form.id = options.id;
getProjectChecking(options.id) getProjectChecking(options.id).then((res) => {
.then((res) => {
this.dataInfo = res.data; this.dataInfo = res.data;
this.loading = false; this.loading = false;
}); });
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.isOpen = false;
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
@ -188,31 +196,32 @@
if (valid) { if (valid) {
// 结果状态同步到审批状态 // 结果状态同步到审批状态
let msg = "合格"; let msg = "合格";
if(this.form.checkResult=="1"){ if (this.form.checkResult == "1") {
this.form.approveStatus="4"; this.form.approveStatus = "4";
}else{ } else {
msg = "不合格"; msg = "不合格";
this.form.approveStatus="3"; this.form.approveStatus = "3";
} }
this.$confirm('是否确认审批'+msg+'?', '提示', { this.$confirm("是否确认审批" + msg + "?", "提示", {
confirmButtonText: '确定', confirmButtonText: "确定",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning' type: "warning",
}).then(() => { })
this.loading=true; .then(() => {
updateProjectChecking(this.form).then(res => { this.loading = true;
updateProjectChecking(this.form).then((res) => {
this.$modal.msgSuccess("审批成功"); this.$modal.msgSuccess("审批成功");
this.loading = false; this.loading = false;
//关闭并刷新列表 //关闭并刷新列表
this.$refs.drawer.closeDrawer(); this.$refs.drawer.closeDrawer();
}); });
}).catch(() => { })
.catch(() => {
console.log("取消操作"); console.log("取消操作");
}); });
} }
}); });
}, },
}, },
}; };
</script> </script>

71
ruoyi-ui/src/views/project/projectAuditinfo/approveMaterialSealDrawer.vue
View File

@ -11,14 +11,22 @@
<template slot="title"> <template slot="title">
<div>{{ title + " 【处理审批】" }}</div> <div>{{ title + " 【处理审批】" }}</div>
</template> </template>
<el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;"> <el-form
ref="form"
v-loading="loading"
:model="form"
:rules="rules"
label-width="80px"
style="padding-right: 20px; padding-left: 20px"
>
<el-form-item label="项目名称"> <el-form-item label="项目名称">
{{dataInfo.projectName}} {{ dataInfo.projectName }}
</el-form-item> </el-form-item>
<el-form-item label="封样图片"> <el-form-item label="封样图片">
<el-image <el-image
ref="preview" ref="preview"
v-for="(img,idx) in dataInfo.imageUrls.split(',')" :key="idx" v-for="(img, idx) in dataInfo.imageUrls.split(',')"
:key="idx"
:src="getImageUrl(img)" :src="getImageUrl(img)"
style="width: 120px; height: 120px; margin-right: 15px" style="width: 120px; height: 120px; margin-right: 15px"
@click="onPreview(img)" @click="onPreview(img)"
@ -94,7 +102,7 @@
v-model="form.comment" v-model="form.comment"
/> />
</el-form-item> </el-form-item>
<div style="text-align: center"> <div style="text-align: center;margin-bottom:20px;">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
@ -107,16 +115,13 @@
style="z-index: 2050" style="z-index: 2050"
/> />
</div> </div>
</template> </template>
<script> <script>
import { import { getMaterialSeal, updateMaterialSeal } from "@/api/project/materialSeal";
getMaterialSeal, import ElImageViewer from "element-ui/packages/image/src/image-viewer";
updateMaterialSeal,
} from "@/api/project/materialSeal";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
export default { export default {
name: "approveMeasureDrawer", name: "approveMeasureDrawer",
components: { components: {
ElImageViewer, ElImageViewer,
@ -133,7 +138,7 @@
open: false, open: false,
isOpen: false, isOpen: false,
dataInfo: { dataInfo: {
imageUrls:"" imageUrls: "",
}, },
title: "", title: "",
form: {}, form: {},
@ -168,17 +173,16 @@
show(options) { show(options) {
this.title = options.typeName; this.title = options.typeName;
this.isOpen = true; this.isOpen = true;
this.form={}; this.form = {};
this.form.id=options.id; this.form.id = options.id;
getMaterialSeal(options.id) getMaterialSeal(options.id).then((res) => {
.then((res) => {
this.dataInfo = res.data; this.dataInfo = res.data;
this.loading = false; this.loading = false;
}); });
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.isOpen = false;
}, },
/** 下载附件 */ /** 下载附件 */
handleDownload(val) { handleDownload(val) {
@ -193,31 +197,32 @@
if (valid) { if (valid) {
// 结果状态同步到审批状态 // 结果状态同步到审批状态
let msg = "合格"; let msg = "合格";
if(this.form.materialResult=="1"){ if (this.form.materialResult == "1") {
this.form.approveStatus="4"; this.form.approveStatus = "4";
}else{ } else {
msg = "不合格"; msg = "不合格";
this.form.approveStatus="3"; this.form.approveStatus = "3";
} }
this.$confirm('是否确认审批'+msg+'?', '提示', { this.$confirm("是否确认审批" + msg + "?", "提示", {
confirmButtonText: '确定', confirmButtonText: "确定",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning' type: "warning",
}).then(() => { })
this.loading=true; .then(() => {
updateMaterialSeal(this.form).then(res => { this.loading = true;
updateMaterialSeal(this.form).then((res) => {
this.$modal.msgSuccess("审批成功"); this.$modal.msgSuccess("审批成功");
this.loading = false; this.loading = false;
//关闭并刷新列表 //关闭并刷新列表
this.$refs.drawer.closeDrawer(); this.$refs.drawer.closeDrawer();
}); });
}).catch(() => { })
.catch(() => {
console.log("取消操作"); console.log("取消操作");
}); });
} }
}); });
}, },
}, },
}; };
</script> </script>

95
ruoyi-ui/src/views/project/projectAuditinfo/approveMeasureDrawer.vue
View File

@ -11,14 +11,22 @@
<template slot="title"> <template slot="title">
<div>{{ title + " 【处理审批】" }}</div> <div>{{ title + " 【处理审批】" }}</div>
</template> </template>
<el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;"> <el-form
ref="form"
v-loading="loading"
:model="form"
:rules="rules"
label-width="80px"
style="padding-right: 20px; padding-left: 20px"
>
<el-form-item label="项目名称"> <el-form-item label="项目名称">
{{dataInfo.projectName}} {{ dataInfo.projectName }}
</el-form-item> </el-form-item>
<el-form-item label="测量图片"> <el-form-item label="测量图片">
<el-image <el-image
ref="preview" ref="preview"
v-for="(img,idx) in dataInfo.imageUrls.split(',')" :key="idx" v-for="(img, idx) in dataInfo.imageUrls.split(',')"
:key="idx"
:src="getImageUrl(img)" :src="getImageUrl(img)"
style="width: 120px; height: 120px; margin-right: 15px" style="width: 120px; height: 120px; margin-right: 15px"
@click="onPreview(img)" @click="onPreview(img)"
@ -81,7 +89,18 @@
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="测量时间"> <el-form-item label="测量时间">
<span>{{ parseTime(dataInfo.measureTime, "{y}-{m}-{d} {h}:{i}") }}</span> <span>{{ parseTime(dataInfo.measureTime, "{y}-{m}-{d}") }}</span>
</el-form-item>
<el-form-item label="测量附件">
<div v-for="(file, index) in dataInfo.measureFiles.split(',')" :key="index">
<el-button
size="mini"
type="text"
icon="el-icon-paperclip"
@click="handledownload(file)"
>{{ file.substring(file.lastIndexOf("/") + 1) }}</el-button
>
</div>
</el-form-item> </el-form-item>
<el-form-item label="测量结果" prop="measureResult"> <el-form-item label="测量结果" prop="measureResult">
<el-radio <el-radio
@ -102,7 +121,7 @@
v-model="form.comment" v-model="form.comment"
/> />
</el-form-item> </el-form-item>
<div style="text-align: center"> <div style="text-align: center;margin-bottom:20px;">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
@ -115,16 +134,13 @@
style="z-index: 2050" style="z-index: 2050"
/> />
</div> </div>
</template> </template>
<script> <script>
import { import { getProjectMeasure, updateProjectMeasure } from "@/api/project/projectMeasure";
getProjectMeasure, import ElImageViewer from "element-ui/packages/image/src/image-viewer";
updateProjectMeasure,
} from "@/api/project/projectMeasure";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
export default { export default {
name: "approveMeasureDrawer", name: "approveMeasureDrawer",
components: { components: {
ElImageViewer, ElImageViewer,
@ -141,7 +157,7 @@
open: false, open: false,
isOpen: false, isOpen: false,
dataInfo: { dataInfo: {
imageUrls:"" imageUrls: "",
}, },
title: "", title: "",
form: {}, form: {},
@ -155,6 +171,7 @@
// 遮罩层 // 遮罩层
loading: true, loading: true,
previewList: [], previewList: [],
fileTypes: ["pdf", "png", "jpg", "jpeg"],
}; };
}, },
computed: {}, computed: {},
@ -176,17 +193,16 @@
show(options) { show(options) {
this.title = options.typeName; this.title = options.typeName;
this.isOpen = true; this.isOpen = true;
this.form={}; this.form = {};
this.form.id=options.id; this.form.id = options.id;
getProjectMeasure(options.id) getProjectMeasure(options.id).then((res) => {
.then((res) => {
this.dataInfo = res.data; this.dataInfo = res.data;
this.loading = false; this.loading = false;
}); });
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.isOpen = false;
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
@ -194,31 +210,42 @@
if (valid) { if (valid) {
// 结果状态同步到审批状态 // 结果状态同步到审批状态
let msg = "合格"; let msg = "合格";
if(this.form.measureResult=="1"){ if (this.form.measureResult == "1") {
this.form.approveStatus="4"; this.form.approveStatus = "4";
}else{ } else {
msg = "不合格"; msg = "不合格";
this.form.approveStatus="3"; this.form.approveStatus = "3";
} }
this.$confirm('是否确认审批'+msg+'?', '提示', { this.$confirm("是否确认审批" + msg + "?", "提示", {
confirmButtonText: '确定', confirmButtonText: "确定",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning' type: "warning",
}).then(() => { })
this.loading=true; .then(() => {
updateProjectMeasure(this.form).then(res => { this.loading = true;
updateProjectMeasure(this.form).then((res) => {
this.$modal.msgSuccess("审批成功"); this.$modal.msgSuccess("审批成功");
this.loading = false; this.loading = false;
//关闭并刷新列表 //关闭并刷新列表
this.$refs.drawer.closeDrawer(); this.$refs.drawer.closeDrawer();
}); });
}).catch(() => { })
.catch(() => {
console.log("取消操作"); console.log("取消操作");
}); });
} }
}); });
}, },
handledownload(url) {
let fileType = url.split(".");
if (
this.fileTypes.indexOf(fileType[fileType.length - 1].toLocaleLowerCase()) > -1
) {
window.open(process.env.VUE_APP_BASE_API + url);
} else {
this.$download.resource(url);
}
}, },
}; },
</script> };
</script>

39
ruoyi-ui/src/views/project/projectMeasure/index.vue
View File

@ -233,7 +233,7 @@
/> />
<el-table-column label="测量时间" align="center" prop="measureTime" width="160"> <el-table-column label="测量时间" align="center" prop="measureTime" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.measureTime, "{y}-{m}-{d} {h}:{i}") }}</span> <span>{{ parseTime(scope.row.measureTime, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批状态" align="center" prop="approveStatus" width="120"> <el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
@ -285,7 +285,6 @@
<dict-tag :options="dict.type.sys_common_isdel" :value="scope.row.isDel" /> <dict-tag :options="dict.type.sys_common_isdel" :value="scope.row.isDel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
@ -375,6 +374,7 @@
v-model="form.measureType" v-model="form.measureType"
placeholder="请选择测量类型" placeholder="请选择测量类型"
style="width: 100%" style="width: 100%"
@change="selectMeasureType"
> >
<el-option <el-option
v-for="dict in dict.type.project_measure_type" v-for="dict in dict.type.project_measure_type"
@ -392,6 +392,7 @@
> >
<el-option <el-option
v-for="dict in dict.type.project_measure_info_type" v-for="dict in dict.type.project_measure_info_type"
v-show="showInfoType(dict)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
@ -454,27 +455,15 @@
<el-date-picker <el-date-picker
clearable clearable
v-model="form.measureTime" v-model="form.measureTime"
type="datetime" type="date"
default-time="10:00:00" value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择测量时间" placeholder="请选择测量时间"
style="width: 100%" style="width: 100%"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="测量结果" prop="measureResult" v-if="false"> <el-form-item label="测量附件" prop="measureFiles">
<el-radio <file-upload v-model="form.measureFiles" :limit="9" @input="fileInput"/>
v-model="form.measureResult"
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="measureFiles" v-if="false">
<file-upload v-model="form.measureFiles" :limit="1" @input="fileInput" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -604,6 +593,20 @@ export default {
} }
this.form.measureFiles = fileUrls; this.form.measureFiles = fileUrls;
}, },
selectMeasureType(val){
this.form.measureInfo=null;
},
showInfoType(dict){
if(this.form.measureType){
if(this.form.measureType=='6'){
return dict.raw.remark == 'gjgc';
}else{
return !dict.raw.remark;
}
}else{
return false;
}
},
getImageUrl(url) { getImageUrl(url) {
return process.env.VUE_APP_BASE_API + url + ".min.jpg"; return process.env.VUE_APP_BASE_API + url + ".min.jpg";
}, },

44
ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
View File

@ -118,7 +118,7 @@
/> />
<el-table-column label="测量时间" align="center" prop="measureTime" width="160"> <el-table-column label="测量时间" align="center" prop="measureTime" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.measureTime, "{y}-{m}-{d} {h}:{i}") }}</span> <span>{{ parseTime(scope.row.measureTime, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -244,6 +244,7 @@
v-model="form.measureType" v-model="form.measureType"
placeholder="请选择测量类型" placeholder="请选择测量类型"
style="width: 100%" style="width: 100%"
@change="selectMeasureType"
> >
<el-option <el-option
v-for="dict in dict.type.project_measure_type" v-for="dict in dict.type.project_measure_type"
@ -261,6 +262,7 @@
> >
<el-option <el-option
v-for="dict in dict.type.project_measure_info_type" v-for="dict in dict.type.project_measure_info_type"
v-show="showInfoType(dict)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
@ -323,27 +325,15 @@
<el-date-picker <el-date-picker
clearable clearable
v-model="form.measureTime" v-model="form.measureTime"
type="datetime" type="date"
default-time="10:00:00" value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择测量时间" placeholder="请选择测量时间"
style="width: 100%" style="width: 100%"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="测量结果" prop="measureResult" v-if="false"> <el-form-item label="测量附件" prop="measureFiles">
<el-radio <file-upload v-model="form.measureFiles" :limit="9" @input="fileInput"/>
v-model="form.measureResult"
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="measureFiles" v-if="false">
<file-upload v-model="form.measureFiles" :limit="1" @input="fileInput" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -390,7 +380,7 @@ export default {
title: "", title: "",
isUnit: true, isUnit: true,
nodes: [], nodes: [],
form: {}, form: {measureType:"",measureInfo:""},
rules: { rules: {
imageUrls: [{ required: true, message: "请上传测量图片", trigger: "blur" }], imageUrls: [{ required: true, message: "请上传测量图片", trigger: "blur" }],
measureType: [{ required: true, message: "请选择测量类型", trigger: "blur" }], measureType: [{ required: true, message: "请选择测量类型", trigger: "blur" }],
@ -443,7 +433,6 @@ export default {
}, },
computed: {}, computed: {},
mounted() {}, mounted() {},
methods: { methods: {
fileInput(files) { fileInput(files) {
let fileUrls = null; let fileUrls = null;
@ -456,6 +445,20 @@ export default {
} }
this.form.measureFiles = fileUrls; this.form.measureFiles = fileUrls;
}, },
selectMeasureType(val){
this.form.measureInfo="";
},
showInfoType(dict){
if(this.form.measureType){
if(this.form.measureType=='6'){
return dict.raw.remark == 'gjgc';
}else{
return dict.raw.remark == null;
}
}else{
return false;
}
},
getImageUrl(url) { getImageUrl(url) {
return process.env.VUE_APP_BASE_API + url + ".min.jpg"; return process.env.VUE_APP_BASE_API + url + ".min.jpg";
}, },
@ -542,7 +545,8 @@ export default {
id: null, id: null,
projectId: null, projectId: null,
deptId: null, deptId: null,
insuranceType: null, insuranceType: "",
measureInfo: "",
insuranceNumber: null, insuranceNumber: null,
insuranceFile: null, insuranceFile: null,
insuranceState: null, insuranceState: null,

2
ruoyi-ui/src/views/work/workFile/index.vue
View File

@ -187,7 +187,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="上传文件" prop="fileData"> <el-form-item label="上传文件" prop="fileData">
<FileUpload @input="fileInput" :fileSize="200"/> <FileUpload @input="fileInput" :fileSize="200" :fileType="['pdf', 'doc', 'docx', 'xls', 'xlsx']"/>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" type="textarea"/> <el-input v-model="form.remark" placeholder="请输入备注" type="textarea"/>

17
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectFilesController.java
View File

@ -8,6 +8,7 @@ import com.yanzhu.jh.work.service.IWorkFileService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -32,9 +33,11 @@ public class ProjectFilesController extends BaseController {
* workFile * workFile
*/ */
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(WorkFile workFile) public TableDataInfo list(WorkFile workFile)
{ {
return success(workFileService.selectWorkFileList(workFile)); startPage();
List<WorkFile> list = workFileService.selectWorkFileList(workFile);
return getDataTable(list);
} }
/** /**
@ -44,7 +47,17 @@ public class ProjectFilesController extends BaseController {
*/ */
@GetMapping("/findCountByType") @GetMapping("/findCountByType")
public AjaxResult findCountByType(WorkFile workFile){ public AjaxResult findCountByType(WorkFile workFile){
clearPage();
return success(workFileService.findCountByType(workFile)); return success(workFileService.findCountByType(workFile));
} }
/**
* 打开文件
* @return
*/
@GetMapping("/readFile/{id}")
public AjaxResult workFileRead(@PathVariable("id") Long id){
return success(workFileService.openWorkFile(id));
}
} }