update code
parent
c067dacc84
commit
73690ae5c2
|
|
@ -92,7 +92,20 @@
|
|||
animation: spin 1.5s linear infinite;
|
||||
}
|
||||
|
||||
|
||||
.div-txt-2 {
|
||||
overflow: hidden;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.div-txt-3 {
|
||||
overflow: hidden;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 3;
|
||||
-webkit-box-orient: vertical;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
@-webkit-keyframes spin {
|
||||
0% {
|
||||
-webkit-transform: rotate(0deg);
|
||||
|
|
|
|||
|
|
@ -1,42 +1,17 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-drawer
|
||||
v-if="onOpen"
|
||||
:visible.sync="onOpen"
|
||||
direction="rtl"
|
||||
size="60%"
|
||||
style="padding-left: 20px"
|
||||
>
|
||||
<el-drawer v-if="onOpen" :visible.sync="onOpen" direction="rtl" size="60%" style="padding-left: 20px">
|
||||
<template slot="title">
|
||||
<div>{{ drawerTitle + " 【材料取样复试】" }}</div>
|
||||
</template>
|
||||
<el-tabs
|
||||
v-model="unitActiveName"
|
||||
style="margin-left: 20px; margin-right: 20px"
|
||||
@tab-click="getList"
|
||||
>
|
||||
<el-tab-pane
|
||||
v-for="(it, idx) in nodes"
|
||||
:label="it.unitName + ''"
|
||||
:name="it.unitId + ''"
|
||||
:key="idx"
|
||||
></el-tab-pane>
|
||||
<el-tabs v-model="unitActiveName" style="margin-left: 20px; margin-right: 20px" @tab-click="getList">
|
||||
<el-tab-pane v-for="(it, idx) in nodes" :label="it.unitName + ''" :name="it.unitId + ''"
|
||||
:key="idx"></el-tab-pane>
|
||||
</el-tabs>
|
||||
<el-row
|
||||
:gutter="10"
|
||||
class="mb8"
|
||||
style="margin-left: 25px; margin-top: 10px; margin-right: 0px"
|
||||
>
|
||||
<el-row :gutter="10" class="mb8" style="margin-left: 25px; margin-top: 10px; margin-right: 0px" v-if="canCreated">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['project:checkDetection:add']"
|
||||
>添加</el-button
|
||||
>
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
||||
v-hasPermi="['project:checkDetection:add']">添加</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button
|
||||
|
|
@ -62,63 +37,32 @@
|
|||
>删除</el-button
|
||||
>
|
||||
</el-col> -->
|
||||
<right-toolbar
|
||||
:showSearch.sync="showSearch"
|
||||
@queryTable="getList"
|
||||
></right-toolbar>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
<el-tabs
|
||||
v-model="queryParams.activeName"
|
||||
@tab-click="getList"
|
||||
style="margin-left: 25px; margin-right: 25px"
|
||||
>
|
||||
<el-tabs v-model="queryParams.activeName" @tab-click="getList" style="margin-left: 25px; margin-right: 25px">
|
||||
<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-table
|
||||
v-loading="loading"
|
||||
:data="checkDetectionList"
|
||||
@selection-change="handleSelectionChange" stripe
|
||||
>
|
||||
<el-table v-loading="loading" :data="checkDetectionList" @selection-change="handleSelectionChange" stripe>
|
||||
<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="160"
|
||||
>
|
||||
<el-table-column label="材料名称" align="center" prop="materialName" width="160">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.materialName }}</div>
|
||||
<div>{{ scope.row.usePosition }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="取样数量"
|
||||
align="center"
|
||||
prop="sampleNum"
|
||||
width="80"
|
||||
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="120"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<el-table-column label="监理专员" align="left" prop="witnessUser" width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.witnessUserName }}</div>
|
||||
<div>{{ scope.row.witnessUser }}</div>
|
||||
|
|
@ -140,112 +84,41 @@
|
|||
</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"
|
||||
width="180"
|
||||
fixed="right"
|
||||
class-name="small-padding fixed-width"
|
||||
>
|
||||
<el-table-column label="操作" align="center" width="180" fixed="right" class-name="small-padding fixed-width">
|
||||
<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.approveStatus != '4'"
|
||||
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 != '4'"
|
||||
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 == '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.approveStatus != '4'" 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 != '4'" 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-tabs>
|
||||
<el-dialog
|
||||
:title="title"
|
||||
v-if="open"
|
||||
:visible.sync="open"
|
||||
width="680px"
|
||||
append-to-body
|
||||
:close-on-click-modal="false"
|
||||
:close-on-press-escape="false"
|
||||
>
|
||||
<el-dialog :title="title" v-if="open" :visible.sync="open" width="680px" append-to-body
|
||||
: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-input
|
||||
v-model="form.projectName"
|
||||
placeholder="请输入项目名称"
|
||||
:disabled="true"
|
||||
/>
|
||||
<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-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 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">
|
||||
|
|
@ -258,38 +131,18 @@
|
|||
<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 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,index) in group.userinfoList"
|
||||
:key="index"
|
||||
:label="item.nickName + ' [' + item.jobTypeName + '] '"
|
||||
:value="item.phonenumber"
|
||||
>
|
||||
<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, index) in group.userinfoList" :key="index"
|
||||
:label="item.nickName + ' [' + item.jobTypeName + '] '" :value="item.phonenumber">
|
||||
</el-option>
|
||||
</el-option-group>
|
||||
</el-select>
|
||||
|
|
@ -298,13 +151,8 @@
|
|||
<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 clearable v-model="form.checkTime" type="date" value-format="yyyy-MM-dd"
|
||||
placeholder="请选择送检时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
|
@ -315,89 +163,37 @@
|
|||
</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">
|
||||
|
|
@ -406,7 +202,7 @@
|
|||
</div>
|
||||
</el-dialog>
|
||||
</el-drawer>
|
||||
<indexDrawer ref="indexDrawer"/>
|
||||
<indexDrawer ref="indexDrawer" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -427,9 +223,10 @@ export default {
|
|||
indexDrawer,
|
||||
},
|
||||
props: {},
|
||||
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 {
|
||||
canCreated:true,
|
||||
showViewer: false,
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
|
|
@ -500,7 +297,7 @@ export default {
|
|||
jxz: "进行中（0）",
|
||||
ywc: "已完成（0）",
|
||||
},
|
||||
checkDetectionList:[],
|
||||
checkDetectionList: [],
|
||||
project: null,
|
||||
nodes: [],
|
||||
unitActiveName: "",
|
||||
|
|
@ -510,9 +307,9 @@ export default {
|
|||
},
|
||||
computed: {},
|
||||
watch: {},
|
||||
created() {},
|
||||
mounted() {},
|
||||
beforeDestroy() {},
|
||||
created() { },
|
||||
mounted() { },
|
||||
beforeDestroy() { },
|
||||
methods: {
|
||||
fileInput(files) {
|
||||
let fileUrls = "";
|
||||
|
|
@ -530,13 +327,13 @@ export default {
|
|||
this.drawerTitle = project.projectName;
|
||||
this.onOpen = true;
|
||||
this.queryParams.projectId = project.id;
|
||||
this.tabs.all="全部数据（0）";
|
||||
this.tabs.jxz="进行中（0）";
|
||||
this.tabs.ywc="已完成（0）";
|
||||
this.tabs.all = "全部数据（0）";
|
||||
this.tabs.jxz = "进行中（0）";
|
||||
this.tabs.ywc = "已完成（0）";
|
||||
this.$api.publics
|
||||
.queryUnitList({
|
||||
projectId: project.id,
|
||||
unitType: 2
|
||||
unitTypes: [2,4]
|
||||
})
|
||||
.then((d) => {
|
||||
this.nodes = d.rows;
|
||||
|
|
@ -550,6 +347,8 @@ export default {
|
|||
},
|
||||
/** 查询特种人员列表 */
|
||||
getList() {
|
||||
let tmps=this.nodes.filter(d=>d.unitId==this.unitActiveName);
|
||||
this.canCreated=tmps.length>0 && tmps[0].unitType==4?false:true;
|
||||
this.loading = true;
|
||||
this.queryParams.deptId = this.unitActiveName;
|
||||
this.queryCount();
|
||||
|
|
@ -661,7 +460,7 @@ export default {
|
|||
if (valid) {
|
||||
if (this.form.id) {
|
||||
//已经上传过检测结果时，修改重新发起提交申请
|
||||
if(this.form.checkState=="2"){
|
||||
if (this.form.checkState == "2") {
|
||||
this.resultform.approveStatus = "1";
|
||||
}
|
||||
updateCheckDetection(this.form).then((response) => {
|
||||
|
|
@ -706,7 +505,7 @@ export default {
|
|||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => {});
|
||||
.catch(() => { });
|
||||
},
|
||||
/** 选择监理专员*/
|
||||
selectWitnessUser(val) {
|
||||
|
|
@ -727,8 +526,8 @@ export default {
|
|||
},
|
||||
/** 审批日志 */
|
||||
handleAuditinfo(row) {
|
||||
row.title="材料取样复试";
|
||||
row.logType="1";
|
||||
row.title = "材料取样复试";
|
||||
row.logType = "1";
|
||||
this.$refs.indexDrawer.show(row);
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,42 +1,17 @@
|
|||
<template>
|
||||
<div class="projectect-attendance-drawer">
|
||||
<el-drawer
|
||||
v-if="isOpen"
|
||||
:visible.sync="isOpen"
|
||||
direction="rtl"
|
||||
size="65%"
|
||||
style="padding-left: 20px"
|
||||
>
|
||||
<el-drawer v-if="isOpen" :visible.sync="isOpen" direction="rtl" size="65%" style="padding-left: 20px">
|
||||
<template slot="title">
|
||||
<div>{{ title + " 【材料封样管理】" }}</div>
|
||||
</template>
|
||||
<el-tabs
|
||||
v-model="unitActiveName"
|
||||
style="margin-left: 20px; margin-right: 20px"
|
||||
@tab-click="getList"
|
||||
>
|
||||
<el-tab-pane
|
||||
v-for="(it, idx) in nodes"
|
||||
:label="it.unitName + ''"
|
||||
:name="it.unitId + ''"
|
||||
:key="idx"
|
||||
></el-tab-pane>
|
||||
<el-tabs v-model="unitActiveName" style="margin-left: 20px; margin-right: 20px" @tab-click="getList">
|
||||
<el-tab-pane v-for="(it, idx) in nodes" :label="it.unitName + ''" :name="it.unitId + ''"
|
||||
:key="idx"></el-tab-pane>
|
||||
</el-tabs>
|
||||
<el-row
|
||||
:gutter="10"
|
||||
class="mb8"
|
||||
style="margin-left: 20px; margin-top: 10px; margin-right: 20px"
|
||||
>
|
||||
<el-row :gutter="10" class="mb8" style="margin-left: 20px; margin-top: 10px; margin-right: 20px" v-if="canCreated">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['project:materialSeal:add']"
|
||||
>新增</el-button
|
||||
>
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
||||
v-hasPermi="['project:materialSeal:add']">新增</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button
|
||||
|
|
@ -62,52 +37,27 @@
|
|||
>删除</el-button
|
||||
>
|
||||
</el-col> -->
|
||||
<right-toolbar
|
||||
:showSearch.sync="showSearch"
|
||||
@queryTable="getList"
|
||||
></right-toolbar>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
<el-tabs
|
||||
v-model="queryParams.activeName"
|
||||
@tab-click="getList"
|
||||
style="margin-left: 25px; margin-right: 25px"
|
||||
>
|
||||
<el-tabs v-model="queryParams.activeName" @tab-click="getList" style="margin-left: 25px; margin-right: 25px">
|
||||
<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="projectMaterialSealList"
|
||||
@selection-change="handleSelectionChange" stripe
|
||||
>
|
||||
</el-tabs>
|
||||
<el-table v-loading="loading" :data="projectMaterialSealList" @selection-change="handleSelectionChange" stripe>
|
||||
<el-table-column label="封样图片" align="center" prop="mainImage" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-image
|
||||
ref="preview"
|
||||
style="width: 50px; height: 50px"
|
||||
:src="getImageUrl(scope.row.mainImage)"
|
||||
@click="onPreview(scope.row.imageUrls)"
|
||||
></el-image>
|
||||
<el-image ref="preview" style="width: 50px; height: 50px" :src="getImageUrl(scope.row.mainImage)"
|
||||
@click="onPreview(scope.row.imageUrls)"></el-image>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="封样名称"
|
||||
align="center"
|
||||
prop="materialName"
|
||||
width="250"
|
||||
>
|
||||
<el-table-column label="封样名称" align="center" prop="materialName" width="250">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.materialName }}</div>
|
||||
<div>{{ scope.row.usePosition }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="品牌"
|
||||
align="center"
|
||||
prop="contractBrand"
|
||||
width="200"
|
||||
>
|
||||
<el-table-column label="品牌" align="center" prop="contractBrand" width="200">
|
||||
<template slot-scope="scope">
|
||||
<div>指定：{{ scope.row.contractBrand }}</div>
|
||||
<div>拟用：{{ scope.row.useBrand }}</div>
|
||||
|
|
@ -118,14 +68,8 @@
|
|||
<span>{{ parseTime(scope.row.sealDate, "{y}-{m}-{d} {h}:{i}") }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="监理专员"
|
||||
align="center"
|
||||
prop="witnessUser"
|
||||
width="120"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-table-column label="监理专员" align="center" prop="witnessUser" width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.witnessUserName }}</div>
|
||||
<div>{{ scope.row.witnessUser }}</div>
|
||||
</template>
|
||||
|
|
@ -142,94 +86,43 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="会签单" align="center" prop="signFiles" width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
v-if="scope.row.signFiles != null"
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-paperclip"
|
||||
@click="handledownloadSignFiles(scope.row)"
|
||||
v-hasPermi="['project:materialSeal:list']"
|
||||
>下载会签单</el-button
|
||||
>
|
||||
<el-button v-if="scope.row.signFiles != null" size="mini" type="text" icon="el-icon-paperclip"
|
||||
@click="handledownloadSignFiles(scope.row)" v-hasPermi="['project:materialSeal:list']">下载会签单</el-button>
|
||||
<span v-if="scope.row.signFiles == null"> - </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="变更单" align="center" prop="alterationFiles" width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
v-if="scope.row.alterationFiles != null"
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-paperclip"
|
||||
<el-button v-if="scope.row.alterationFiles != null" size="mini" type="text" icon="el-icon-paperclip"
|
||||
@click="handledownloadAlterationFiles(scope.row)"
|
||||
v-hasPermi="['project:materialSeal:list']"
|
||||
>下载变更单</el-button
|
||||
>
|
||||
v-hasPermi="['project:materialSeal:list']">下载变更单</el-button>
|
||||
<span v-if="scope.row.signFiles == null"> - </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
fixed="right"
|
||||
class-name="small-padding fixed-width"
|
||||
width="150"
|
||||
>
|
||||
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="150">
|
||||
<template slot-scope="scope">
|
||||
<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!='4'"
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['project:materialSeal: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:materialSeal:remove']"
|
||||
>删除</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 != '4'" size="mini" type="text" icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)" v-hasPermi="['project:materialSeal: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:materialSeal: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="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
|
||||
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false"
|
||||
:close-on-press-escape="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="项目名称" prop="projectName">
|
||||
<el-input
|
||||
v-model="form.projectName"
|
||||
placeholder="请输入项目名称"
|
||||
:disabled="true"
|
||||
/>
|
||||
<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-input v-model="form.deptName" placeholder="请输入单位名称" :disabled="true" />
|
||||
</el-form-item>
|
||||
<el-form-item label="封样图片" prop="imageUrls">
|
||||
<image-upload v-model="form.imageUrls" :limit="9" />
|
||||
|
|
@ -241,69 +134,34 @@
|
|||
<el-input v-model="form.usePosition" placeholder="请输入使用部位" />
|
||||
</el-form-item>
|
||||
<el-form-item label="指定品牌" prop="contractBrand">
|
||||
<el-input
|
||||
v-model="form.contractBrand"
|
||||
placeholder="请输入指定品牌"
|
||||
@change="onlyFile"
|
||||
/>
|
||||
<el-input v-model="form.contractBrand" placeholder="请输入指定品牌" @change="onlyFile" />
|
||||
</el-form-item>
|
||||
<el-form-item label="拟用品牌" prop="useBrand">
|
||||
<el-input
|
||||
v-model="form.useBrand"
|
||||
placeholder="请输入拟用品牌"
|
||||
@change="onlyFile"
|
||||
/>
|
||||
<el-input v-model="form.useBrand" placeholder="请输入拟用品牌" @change="onlyFile" />
|
||||
</el-form-item>
|
||||
<el-form-item label="封样时间" prop="sealDate">
|
||||
<el-date-picker
|
||||
clearable
|
||||
v-model="form.sealDate"
|
||||
type="datetime"
|
||||
default-time="10:00:00"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择封样时间"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-date-picker clearable v-model="form.sealDate" type="datetime" default-time="10:00:00"
|
||||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择封样时间" style="width: 100%">
|
||||
</el-date-picker>
|
||||
</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-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="signFiles">
|
||||
<file-upload
|
||||
v-model="form.signFiles"
|
||||
:limit="1"
|
||||
:fileType="['pdf', 'png', 'jpg', 'jpeg']"
|
||||
@input="fileInputSign"
|
||||
/>
|
||||
<file-upload v-model="form.signFiles" :limit="1" :fileType="['pdf', 'png', 'jpg', 'jpeg']"
|
||||
@input="fileInputSign" />
|
||||
</el-form-item>
|
||||
<el-form-item label="变更单" prop="alterationFiles" v-show="true">
|
||||
<file-upload
|
||||
v-model="form.alterationFiles"
|
||||
:limit="1"
|
||||
:fileType="['pdf', 'png', 'jpg', 'jpeg']"
|
||||
@input="fileInputAlteration"
|
||||
/>
|
||||
<file-upload v-model="form.alterationFiles" :limit="1" :fileType="['pdf', 'png', 'jpg', 'jpeg']"
|
||||
@input="fileInputAlteration" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
|
|
@ -312,12 +170,7 @@
|
|||
</div>
|
||||
</el-dialog>
|
||||
</el-drawer>
|
||||
<el-image-viewer
|
||||
v-if="showViewer"
|
||||
:on-close="closeViewer"
|
||||
:url-list="previewList"
|
||||
style="z-index: 2050"
|
||||
/>
|
||||
<el-image-viewer v-if="showViewer" :on-close="closeViewer" :url-list="previewList" style="z-index: 2050" />
|
||||
<indexDrawer ref="indexDrawer"></indexDrawer>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -343,6 +196,7 @@ export default {
|
|||
dicts: ["project_check_status"],
|
||||
data() {
|
||||
return {
|
||||
canCreated:true,
|
||||
showViewer: false,
|
||||
open: false,
|
||||
isOpen: false,
|
||||
|
|
@ -405,13 +259,13 @@ export default {
|
|||
jxz: "进行中（0）",
|
||||
ywc: "已完成（0）",
|
||||
},
|
||||
deptUserData:[],
|
||||
deptUserData: [],
|
||||
previewList: [],
|
||||
isOnly: false,
|
||||
};
|
||||
},
|
||||
computed: {},
|
||||
mounted() {},
|
||||
mounted() { },
|
||||
|
||||
methods: {
|
||||
fileInputSign(files) {
|
||||
|
|
@ -467,14 +321,14 @@ export default {
|
|||
this.project = project;
|
||||
this.title = project.projectName;
|
||||
this.isOpen = true;
|
||||
this.tabs.all="全部数据（0）";
|
||||
this.tabs.jxz="进行中（0）";
|
||||
this.tabs.ywc="已完成（0）";
|
||||
this.tabs.all = "全部数据（0）";
|
||||
this.tabs.jxz = "进行中（0）";
|
||||
this.tabs.ywc = "已完成（0）";
|
||||
this.queryParams.projectId = project.id;
|
||||
this.$api.publics
|
||||
.queryUnitList({
|
||||
projectId: project.id,
|
||||
unitType: 2,
|
||||
unitTypes: [2,4],
|
||||
})
|
||||
.then((d) => {
|
||||
this.nodes = d.rows;
|
||||
|
|
@ -491,6 +345,8 @@ export default {
|
|||
},
|
||||
// 页签点击
|
||||
getList() {
|
||||
let tmps=this.nodes.filter(d=>d.unitId==this.unitActiveName);
|
||||
this.canCreated=tmps.length>0 && tmps[0].unitType==4?false:true;
|
||||
this.queryParams.deptId = this.unitActiveName;
|
||||
this.queryCount()
|
||||
this.loading = true;
|
||||
|
|
@ -608,7 +464,7 @@ export default {
|
|||
submitForm() {
|
||||
this.$refs["form"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.form.approveStatus="1";
|
||||
this.form.approveStatus = "1";
|
||||
if (this.form.id != null) {
|
||||
updateMaterialSeal(this.form).then((response) => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
|
|
@ -639,7 +495,7 @@ export default {
|
|||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => {});
|
||||
.catch(() => { });
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
|
|
@ -684,8 +540,8 @@ export default {
|
|||
},
|
||||
/** 审批日志 */
|
||||
handleAuditinfo(row) {
|
||||
row.title="材料封样";
|
||||
row.logType="4";
|
||||
row.title = "材料封样";
|
||||
row.logType = "4";
|
||||
this.$refs.indexDrawer.show(row);
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,42 +1,17 @@
|
|||
<template>
|
||||
<div class="projectect-attendance-drawer">
|
||||
<el-drawer
|
||||
v-if="isOpen"
|
||||
:visible.sync="isOpen"
|
||||
direction="rtl"
|
||||
size="65%"
|
||||
style="padding-left: 20px"
|
||||
>
|
||||
<el-drawer v-if="isOpen" :visible.sync="isOpen" direction="rtl" size="65%" style="padding-left: 20px">
|
||||
<template slot="title">
|
||||
<div>{{ title + " 【举牌验收管理】" }}</div>
|
||||
</template>
|
||||
<el-tabs
|
||||
v-model="unitActiveName"
|
||||
style="margin-left: 20px; margin-right: 20px"
|
||||
@tab-click="getList"
|
||||
>
|
||||
<el-tab-pane
|
||||
v-for="(it, idx) in nodes"
|
||||
:label="it.unitName + ''"
|
||||
:name="it.unitId + ''"
|
||||
:key="idx"
|
||||
></el-tab-pane>
|
||||
<el-tabs v-model="unitActiveName" style="margin-left: 20px; margin-right: 20px" @tab-click="getList">
|
||||
<el-tab-pane v-for="(it, idx) in nodes" :label="it.unitName + ''" :name="it.unitId + ''"
|
||||
:key="idx"></el-tab-pane>
|
||||
</el-tabs>
|
||||
<el-row
|
||||
:gutter="10"
|
||||
class="mb8"
|
||||
style="margin-left: 20px; margin-top: 10px; margin-right: 20px"
|
||||
>
|
||||
<el-row :gutter="10" class="mb8" style="margin-left: 20px; margin-top: 10px; margin-right: 20px" v-if="canCreated">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['project:projectChecking:add']"
|
||||
>新增</el-button
|
||||
>
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
||||
v-hasPermi="['project:projectChecking:add']">新增</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button
|
||||
|
|
@ -62,100 +37,45 @@
|
|||
>删除</el-button
|
||||
>
|
||||
</el-col> -->
|
||||
<right-toolbar
|
||||
:showSearch.sync="showSearch"
|
||||
@queryTable="getList"
|
||||
></right-toolbar>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-tabs
|
||||
v-model="queryParams.activeName"
|
||||
@tab-click="getList"
|
||||
style="padding-left: 20px; padding-right: 20px"
|
||||
>
|
||||
<el-tabs v-model="queryParams.activeName" @tab-click="getList" style="padding-left: 20px; padding-right: 20px">
|
||||
<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="projectCheckingList"
|
||||
@selection-change="handleSelectionChange"
|
||||
style="padding-left: 20px; padding-right: 20px"
|
||||
stripe
|
||||
>
|
||||
<el-table v-loading="loading" :data="projectCheckingList" @selection-change="handleSelectionChange"
|
||||
style="padding-left: 20px; padding-right: 20px" stripe>
|
||||
<el-table-column label="验收图片" align="center" prop="mainImage" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-image
|
||||
ref="preview"
|
||||
style="width: 50px; height: 50px"
|
||||
:src="getImageUrl(scope.row.mainImage)"
|
||||
@click="onPreview(scope.row.imageUrls)"
|
||||
></el-image>
|
||||
<el-image ref="preview" style="width: 50px; height: 50px" :src="getImageUrl(scope.row.mainImage)"
|
||||
@click="onPreview(scope.row.imageUrls)"></el-image>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="验收类型"
|
||||
align="center"
|
||||
prop="dataTypeLvl1"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<el-table-column label="验收类型" align="center" prop="dataTypeLvl1" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<dict-tag
|
||||
:options="dict.type.project_checking_data_type_lvl1"
|
||||
:value="scope.row.dataTypeLvl1"
|
||||
/>
|
||||
<dict-tag
|
||||
:options="dict.type.project_checking_data_type_lvl2"
|
||||
:value="scope.row.dataTypeLvl2"
|
||||
/>
|
||||
<dict-tag :options="dict.type.project_checking_data_type_lvl1" :value="scope.row.dataTypeLvl1" />
|
||||
<dict-tag :options="dict.type.project_checking_data_type_lvl2" :value="scope.row.dataTypeLvl2" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="验收工序部位"
|
||||
align="left"
|
||||
prop="checkWorkingPosition"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column label="验收工序部位" align="left" prop="checkWorkingPosition" show-overflow-tooltip />
|
||||
|
||||
<el-table-column
|
||||
label="验收描述"
|
||||
align="left"
|
||||
prop="intro"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
label="质量专员"
|
||||
align="left"
|
||||
prop="qualityUser"
|
||||
width="120"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<el-table-column label="验收描述" align="left" prop="intro" show-overflow-tooltip />
|
||||
<el-table-column label="质量专员" align="left" prop="qualityUser" width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.qualityUserName }}</div>
|
||||
<div>{{ scope.row.qualityUser }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="监理专员"
|
||||
align="left"
|
||||
prop="superviseUser"
|
||||
width="120"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<el-table-column label="监理专员" align="left" prop="superviseUser" width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.superviseUserName }}</div>
|
||||
<div>{{ scope.row.superviseUser }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="验收时间"
|
||||
align="center"
|
||||
prop="checkingDate"
|
||||
width="140"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<el-table-column label="验收时间" align="center" prop="checkingDate" width="140" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.checkingDate, "{y}-{m}-{d} {h}:{i}") }}</span>
|
||||
</template>
|
||||
|
|
@ -170,200 +90,88 @@
|
|||
</el-table-column> -->
|
||||
<el-table-column label="审批状态" align="center" prop="approveStatus">
|
||||
<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"
|
||||
fixed="right"
|
||||
class-name="small-padding fixed-width"
|
||||
width="150"
|
||||
>
|
||||
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
v-if="scope.row.checkingFiles != null"
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-paperclip"
|
||||
@click="handledownload(scope.row)"
|
||||
v-hasPermi="['project:projectChecking:list']"
|
||||
>下载附件</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 != '4'"
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['project:projectChecking: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:projectChecking:remove']"
|
||||
>删除</el-button
|
||||
>
|
||||
<el-button v-if="scope.row.checkingFiles != null" size="mini" type="text" icon="el-icon-paperclip"
|
||||
@click="handledownload(scope.row)" v-hasPermi="['project:projectChecking:list']">下载附件</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 != '4'" size="mini" type="text" icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)" v-hasPermi="['project:projectChecking: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:projectChecking: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="780px"
|
||||
append-to-body
|
||||
:close-on-click-modal="false"
|
||||
:close-on-press-escape="false"
|
||||
>
|
||||
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false"
|
||||
:close-on-press-escape="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="项目名称" prop="projectName">
|
||||
<el-input
|
||||
v-model="form.projectName"
|
||||
placeholder="请输入项目名称"
|
||||
:disabled="true"
|
||||
/>
|
||||
<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-input v-model="form.deptName" placeholder="请输入单位名称" :disabled="true" />
|
||||
</el-form-item>
|
||||
<el-form-item label="验收图片" prop="imageUrls">
|
||||
<image-upload v-model="form.imageUrls" :limit="9" />
|
||||
</el-form-item>
|
||||
<el-form-item label="验收类型" prop="dataTypeLvl1">
|
||||
<el-select
|
||||
v-model="form.dataTypeLvl1"
|
||||
placeholder="请选择验收类型"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.project_checking_data_type_lvl1"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
<el-select v-model="form.dataTypeLvl1" placeholder="请选择验收类型" style="width: 100%">
|
||||
<el-option v-for="dict in dict.type.project_checking_data_type_lvl1" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型分类" prop="dataTypeLvl2" v-if="form.dataTypeLvl1">
|
||||
<el-select
|
||||
v-model="form.dataTypeLvl2"
|
||||
placeholder="请选择类型分类"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.project_checking_data_type_lvl2"
|
||||
v-show="form.dataTypeLvl1 == dict.raw.remark"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
<el-select v-model="form.dataTypeLvl2" placeholder="请选择类型分类" style="width: 100%">
|
||||
<el-option v-for="dict in dict.type.project_checking_data_type_lvl2"
|
||||
v-show="form.dataTypeLvl1 == dict.raw.remark" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="质量专员" prop="qualityUser">
|
||||
<el-select
|
||||
v-model="form.qualityUser"
|
||||
placeholder="请选择质量专员"
|
||||
filterable
|
||||
style="width: 100%"
|
||||
@change="selectQualityUser"
|
||||
>
|
||||
<el-option-group
|
||||
v-for="group in deptUserData2"
|
||||
: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-select v-model="form.qualityUser" placeholder="请选择质量专员" filterable style="width: 100%"
|
||||
@change="selectQualityUser">
|
||||
<el-option-group v-for="group in deptUserData2" :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="superviseUser">
|
||||
<el-select
|
||||
v-model="form.superviseUser"
|
||||
placeholder="请选择监理专员"
|
||||
filterable
|
||||
style="width: 100%"
|
||||
@change="selectSuperviseUser"
|
||||
>
|
||||
<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-select v-model="form.superviseUser" placeholder="请选择监理专员" filterable style="width: 100%"
|
||||
@change="selectSuperviseUser">
|
||||
<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="checkWorkingPosition">
|
||||
<el-input
|
||||
type="textarea"
|
||||
v-model="form.checkWorkingPosition"
|
||||
placeholder="请输入验收工序部位"
|
||||
/>
|
||||
<el-input type="textarea" v-model="form.checkWorkingPosition" placeholder="请输入验收工序部位" />
|
||||
</el-form-item>
|
||||
<el-form-item label="验收描述" prop="intro">
|
||||
<el-input v-model="form.intro" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
<el-form-item label="验收时间" prop="checkingDate">
|
||||
<el-date-picker
|
||||
style="width: 100%"
|
||||
v-model="form.checkingDate"
|
||||
type="datetime"
|
||||
placeholder="选择日期时间"
|
||||
default-time="10:00:00"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
>
|
||||
<el-date-picker style="width: 100%" v-model="form.checkingDate" type="datetime" placeholder="选择日期时间"
|
||||
default-time="10:00:00" value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="验收结果" prop="checkResult" v-if="false">
|
||||
<el-radio
|
||||
v-model="form.checkResult"
|
||||
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="form.checkResult" 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>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
|
|
@ -372,12 +180,7 @@
|
|||
</div>
|
||||
</el-dialog>
|
||||
</el-drawer>
|
||||
<el-image-viewer
|
||||
v-if="showViewer"
|
||||
:on-close="closeViewer"
|
||||
:url-list="previewList"
|
||||
style="z-index: 2050"
|
||||
/>
|
||||
<el-image-viewer v-if="showViewer" :on-close="closeViewer" :url-list="previewList" style="z-index: 2050" />
|
||||
<index-drawer ref="indexDrawer"></index-drawer>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -403,6 +206,7 @@ export default {
|
|||
dicts: ["project_check_status", "project_checking_result", "project_checking_data_type_lvl1", "project_checking_data_type_lvl2"],
|
||||
data() {
|
||||
return {
|
||||
canCreated:true,
|
||||
showViewer: false,
|
||||
open: false,
|
||||
isOpen: false,
|
||||
|
|
@ -461,7 +265,7 @@ export default {
|
|||
};
|
||||
},
|
||||
computed: {},
|
||||
mounted() {},
|
||||
mounted() { },
|
||||
|
||||
methods: {
|
||||
getImageUrl(url) {
|
||||
|
|
@ -488,7 +292,7 @@ export default {
|
|||
this.$api.publics
|
||||
.queryUnitList({
|
||||
projectId: project.id,
|
||||
unitType: 2,
|
||||
unitTypes: [2,4],
|
||||
})
|
||||
.then((d) => {
|
||||
this.nodes = d.rows;
|
||||
|
|
@ -521,6 +325,8 @@ export default {
|
|||
},
|
||||
// 页签点击
|
||||
getList() {
|
||||
let tmps=this.nodes.filter(d=>d.unitId==this.unitActiveName);
|
||||
this.canCreated=tmps.length>0 && tmps[0].unitType==4?false:true;
|
||||
this.queryParams.deptId = this.unitActiveName;
|
||||
this.queryCount();
|
||||
this.loading = true;
|
||||
|
|
@ -562,7 +368,7 @@ export default {
|
|||
createTime: null,
|
||||
updateBy: null,
|
||||
updateTime: null,
|
||||
remark: null,
|
||||
remark: null,
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
|
|
@ -651,7 +457,7 @@ export default {
|
|||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => {});
|
||||
.catch(() => { });
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
|
|
|
|||
|
|
@ -432,14 +432,7 @@ export default {
|
|||
.sp-orange {
|
||||
color: orange;
|
||||
}
|
||||
|
||||
.div-txt-2 {
|
||||
overflow: hidden;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,42 +1,17 @@
|
|||
<template>
|
||||
<div class="projectect-attendance-drawer">
|
||||
<el-drawer
|
||||
v-if="isOpen"
|
||||
:visible.sync="isOpen"
|
||||
direction="rtl"
|
||||
size="65%"
|
||||
style="padding-left: 20px"
|
||||
>
|
||||
<el-drawer v-if="isOpen" :visible.sync="isOpen" direction="rtl" size="65%" style="padding-left: 20px">
|
||||
<template slot="title">
|
||||
<div>{{ title + " 【实测实量管理】" }}</div>
|
||||
</template>
|
||||
<el-tabs
|
||||
v-model="unitActiveName"
|
||||
style="margin-left: 20px; margin-right: 20px"
|
||||
@tab-click="getList"
|
||||
>
|
||||
<el-tab-pane
|
||||
v-for="(it, idx) in nodes"
|
||||
:label="it.unitName + ''"
|
||||
:name="it.unitId + ''"
|
||||
:key="idx"
|
||||
></el-tab-pane>
|
||||
<el-tabs v-model="unitActiveName" style="margin-left: 20px; margin-right: 20px" @tab-click="getList">
|
||||
<el-tab-pane v-for="(it, idx) in nodes" :label="it.unitName + ''" :name="it.unitId + ''"
|
||||
:key="idx"></el-tab-pane>
|
||||
</el-tabs>
|
||||
<el-row
|
||||
:gutter="10"
|
||||
class="mb8"
|
||||
style="margin-left: 20px; margin-top: 10px; margin-right: 20px"
|
||||
>
|
||||
<el-row :gutter="10" class="mb8" style="margin-left: 20px; margin-top: 10px; margin-right: 20px" v-if="canCreated">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['project:projectMeasure:add']"
|
||||
>新增</el-button
|
||||
>
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
||||
v-hasPermi="['project:projectMeasure:add']">新增</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button
|
||||
|
|
@ -62,71 +37,39 @@
|
|||
>删除</el-button
|
||||
>
|
||||
</el-col> -->
|
||||
<right-toolbar
|
||||
:showSearch.sync="showSearch"
|
||||
@queryTable="getList"
|
||||
></right-toolbar>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-tabs
|
||||
v-model="queryParams.activeName"
|
||||
@tab-click="getList"
|
||||
style="margin-left: 25px; margin-right: 25px"
|
||||
>
|
||||
<el-tabs v-model="queryParams.activeName" @tab-click="getList" style="margin-left: 25px; margin-right: 25px">
|
||||
<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-tabs>
|
||||
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="projectMeasureList"
|
||||
@selection-change="handleSelectionChange" stripe
|
||||
>
|
||||
<el-table v-loading="loading" :data="projectMeasureList" @selection-change="handleSelectionChange" stripe>
|
||||
<el-table-column label="测量图片" align="center" prop="mainImage" width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-image
|
||||
ref="preview"
|
||||
style="width: 50px; height: 50px"
|
||||
:src="getImageUrl(scope.row.mainImage)"
|
||||
@click="onPreview(scope.row.imageUrls)"
|
||||
></el-image>
|
||||
<el-image ref="preview" style="width: 50px; height: 50px" :src="getImageUrl(scope.row.mainImage)"
|
||||
@click="onPreview(scope.row.imageUrls)"></el-image>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="测量类型" align="center" prop="measureType">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag
|
||||
:options="dict.type.project_measure_type"
|
||||
:value="scope.row.measureType"
|
||||
/>
|
||||
<dict-tag :options="dict.type.project_measure_type" :value="scope.row.measureType" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="测量内容" align="center" prop="measureInfo">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag
|
||||
:options="dict.type.project_measure_info_type"
|
||||
:value="scope.row.measureInfo"
|
||||
/>
|
||||
<dict-tag :options="dict.type.project_measure_info_type" :value="scope.row.measureInfo" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="测量部位"
|
||||
align="center"
|
||||
prop="measurePosition"
|
||||
width="150"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column label="测量部位" align="center" prop="measurePosition" width="150" show-overflow-tooltip />
|
||||
<el-table-column label="测量时间" align="center" prop="measureTime" width="160">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.measureTime, "{y}-{m}-{d}") }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="测量点位"
|
||||
align="center"
|
||||
prop="measurePointPosition"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column label="测量点位" align="center" prop="measurePointPosition" show-overflow-tooltip />
|
||||
<!-- <el-table-column label="测量结果" align="center" prop="measureResult">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag
|
||||
|
|
@ -140,133 +83,58 @@
|
|||
<dict-tag :options="dict.type.project_check_status" :value="scope.row.approveStatus" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="质量专员"
|
||||
align="center"
|
||||
prop="qualityUser"
|
||||
width="100"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<el-table-column label="质量专员" align="center" prop="qualityUser" width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.qualityUserName }}</div>
|
||||
<div>{{ scope.row.qualityUser }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="监理专员"
|
||||
align="left"
|
||||
prop="superviseUser"
|
||||
width="100"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<el-table-column label="监理专员" align="left" prop="superviseUser" width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.superviseUserName }}</div>
|
||||
<div>{{ scope.row.superviseUser }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
fixed="right"
|
||||
class-name="small-padding fixed-width"
|
||||
width="150"
|
||||
>
|
||||
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
v-if="scope.row.measureFiles != null"
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-paperclip"
|
||||
@click="handledownload(scope.row)"
|
||||
v-hasPermi="['project:projectMeasure:list']"
|
||||
>下载附件</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 != '4'"
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['project:projectMeasure: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:projectMeasure:remove']"
|
||||
>删除</el-button
|
||||
>
|
||||
<el-button v-if="scope.row.measureFiles != null" size="mini" type="text" icon="el-icon-paperclip"
|
||||
@click="handledownload(scope.row)" v-hasPermi="['project:projectMeasure:list']">下载附件</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 != '4'" size="mini" type="text" icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)" v-hasPermi="['project:projectMeasure: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:projectMeasure: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="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
|
||||
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false"
|
||||
:close-on-press-escape="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="项目名称" prop="projectName">
|
||||
<el-input
|
||||
v-model="form.projectName"
|
||||
placeholder="请输入项目名称"
|
||||
:disabled="true"
|
||||
/>
|
||||
<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-input v-model="form.deptName" placeholder="请输入单位名称" :disabled="true" />
|
||||
</el-form-item>
|
||||
<el-form-item label="测量图片" prop="imageUrls">
|
||||
<image-upload v-model="form.imageUrls" :limit="9" />
|
||||
</el-form-item>
|
||||
<el-form-item label="测量类型" prop="measureType">
|
||||
<el-select
|
||||
v-model="form.measureType"
|
||||
placeholder="请选择测量类型"
|
||||
style="width: 100%"
|
||||
@change="selectMeasureType"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.project_measure_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
<el-select v-model="form.measureType" placeholder="请选择测量类型" style="width: 100%" @change="selectMeasureType">
|
||||
<el-option v-for="dict in dict.type.project_measure_type" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="测量内容" prop="measureInfo">
|
||||
<el-select
|
||||
v-model="form.measureInfo"
|
||||
placeholder="请选择测量内容"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.project_measure_info_type"
|
||||
v-show="showInfoType(dict)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
<el-select v-model="form.measureInfo" placeholder="请选择测量内容" style="width: 100%">
|
||||
<el-option v-for="dict in dict.type.project_measure_info_type" v-show="showInfoType(dict)"
|
||||
:key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="测量部位" prop="measurePosition">
|
||||
|
|
@ -276,64 +144,34 @@
|
|||
<el-input v-model="form.measurePointPosition" placeholder="请输入测量点位" />
|
||||
</el-form-item>
|
||||
<el-form-item label="质量专员" prop="qualityUser">
|
||||
<el-select
|
||||
v-model="form.qualityUser"
|
||||
placeholder="请选择质量专员"
|
||||
filterable
|
||||
style="width: 100%"
|
||||
@change="selectQualityUser"
|
||||
>
|
||||
<el-option-group
|
||||
v-for="group in deptUserData2"
|
||||
: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-select v-model="form.qualityUser" placeholder="请选择质量专员" filterable style="width: 100%"
|
||||
@change="selectQualityUser">
|
||||
<el-option-group v-for="group in deptUserData2" :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="superviseUser">
|
||||
<el-select
|
||||
v-model="form.superviseUser"
|
||||
placeholder="请选择监理专员"
|
||||
filterable
|
||||
style="width: 100%"
|
||||
@change="selectSuperviseUser"
|
||||
>
|
||||
<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-select v-model="form.superviseUser" placeholder="请选择监理专员" filterable style="width: 100%"
|
||||
@change="selectSuperviseUser">
|
||||
<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="measureTime">
|
||||
<el-date-picker
|
||||
clearable
|
||||
v-model="form.measureTime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择测量时间"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-date-picker clearable v-model="form.measureTime" type="date" value-format="yyyy-MM-dd"
|
||||
placeholder="请选择测量时间" style="width: 100%">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="测量附件" prop="measureFiles">
|
||||
<file-upload v-model="form.measureFiles" :limit="9" @input="fileInput"/>
|
||||
<file-upload v-model="form.measureFiles" :limit="9" @input="fileInput" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
|
|
@ -342,12 +180,7 @@
|
|||
</div>
|
||||
</el-dialog>
|
||||
</el-drawer>
|
||||
<el-image-viewer
|
||||
v-if="showViewer"
|
||||
:on-close="closeViewer"
|
||||
:url-list="previewList"
|
||||
style="z-index: 2050"
|
||||
/>
|
||||
<el-image-viewer v-if="showViewer" :on-close="closeViewer" :url-list="previewList" style="z-index: 2050" />
|
||||
<indexDrawer ref="indexDrawer"></indexDrawer>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -370,9 +203,10 @@ export default {
|
|||
indexDrawer,
|
||||
ElImageViewer,
|
||||
},
|
||||
dicts: ["project_check_status","project_measure_type", "project_checking_result", "project_measure_info_type"],
|
||||
dicts: ["project_check_status", "project_measure_type", "project_checking_result", "project_measure_info_type"],
|
||||
data() {
|
||||
return {
|
||||
canCreated:true,
|
||||
showViewer: false,
|
||||
open: false,
|
||||
isOpen: false,
|
||||
|
|
@ -380,7 +214,7 @@ export default {
|
|||
title: "",
|
||||
isUnit: true,
|
||||
nodes: [],
|
||||
form: {measureType:"",measureInfo:""},
|
||||
form: { measureType: "", measureInfo: "" },
|
||||
rules: {
|
||||
imageUrls: [{ required: true, message: "请上传测量图片", trigger: "blur" }],
|
||||
measureType: [{ required: true, message: "请选择测量类型", trigger: "blur" }],
|
||||
|
|
@ -427,12 +261,12 @@ export default {
|
|||
ywc: "已完成（0）",
|
||||
},
|
||||
deptUserData: [],
|
||||
deptUserData2:[],
|
||||
deptUserData2: [],
|
||||
previewList: [],
|
||||
};
|
||||
},
|
||||
computed: {},
|
||||
mounted() {},
|
||||
mounted() { },
|
||||
methods: {
|
||||
fileInput(files) {
|
||||
let fileUrls = null;
|
||||
|
|
@ -445,17 +279,17 @@ export default {
|
|||
}
|
||||
this.form.measureFiles = fileUrls;
|
||||
},
|
||||
selectMeasureType(val){
|
||||
this.form.measureInfo="";
|
||||
selectMeasureType(val) {
|
||||
this.form.measureInfo = "";
|
||||
},
|
||||
showInfoType(dict){
|
||||
if(this.form.measureType){
|
||||
if(this.form.measureType=='6'){
|
||||
showInfoType(dict) {
|
||||
if (this.form.measureType) {
|
||||
if (this.form.measureType == '6') {
|
||||
return dict.raw.remark == 'gjgc';
|
||||
}else{
|
||||
} else {
|
||||
return dict.raw.remark == null;
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
|
@ -476,14 +310,14 @@ export default {
|
|||
this.project = project;
|
||||
this.title = project.projectName;
|
||||
this.isOpen = true;
|
||||
this.tabs.all="全部数据（0）";
|
||||
this.tabs.jxz="进行中（0）";
|
||||
this.tabs.ywc="已完成（0）";
|
||||
this.tabs.all = "全部数据（0）";
|
||||
this.tabs.jxz = "进行中（0）";
|
||||
this.tabs.ywc = "已完成（0）";
|
||||
this.queryParams.projectId = project.id;
|
||||
this.$api.publics
|
||||
.queryUnitList({
|
||||
projectId: project.id,
|
||||
unitType: 2
|
||||
unitTypes: [2,4]
|
||||
})
|
||||
.then((d) => {
|
||||
this.nodes = d.rows;
|
||||
|
|
@ -516,6 +350,8 @@ export default {
|
|||
},
|
||||
// 页签点击
|
||||
getList() {
|
||||
let tmps=this.nodes.filter(d=>d.unitId==this.unitActiveName);
|
||||
this.canCreated=tmps.length>0 && tmps[0].unitType==4?false:true;
|
||||
this.queryParams.deptId = this.unitActiveName;
|
||||
this.queryCount();
|
||||
this.loading = true;
|
||||
|
|
@ -616,7 +452,7 @@ export default {
|
|||
submitForm() {
|
||||
this.$refs["form"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.form.approveStatus="1";
|
||||
this.form.approveStatus = "1";
|
||||
if (this.form.id) {
|
||||
updateProjectMeasure(this.form).then((response) => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
|
|
@ -647,7 +483,7 @@ export default {
|
|||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => {});
|
||||
.catch(() => { });
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
|
|
@ -688,8 +524,8 @@ export default {
|
|||
},
|
||||
/** 审批日志 */
|
||||
handleAuditinfo(row) {
|
||||
row.title="实测实量";
|
||||
row.logType="2";
|
||||
row.title = "实测实量";
|
||||
row.logType = "2";
|
||||
this.$refs.indexDrawer.show(row);
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,196 +1,85 @@
|
|||
<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="projectAddress">
|
||||
<el-input
|
||||
v-model="queryParams.projectAddress"
|
||||
placeholder="请输入项目地址"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.projectAddress" placeholder="请输入项目地址" clearable
|
||||
@keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="项目分类" prop="projectType">
|
||||
<el-select
|
||||
v-model="queryParams.projectType"
|
||||
placeholder="请选择项目分类"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.project_category"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
<el-select v-model="queryParams.projectType" placeholder="请选择项目分类" clearable>
|
||||
<el-option v-for="dict in dict.type.project_category" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="项目等级" prop="projiectLevel">
|
||||
<el-select
|
||||
v-model="queryParams.projiectLevel"
|
||||
placeholder="请选择项目等级"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.project_level"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
<el-select v-model="queryParams.projiectLevel" placeholder="请选择项目等级" clearable>
|
||||
<el-option v-for="dict in dict.type.project_level" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="建设类型" prop="projectNature">
|
||||
<el-select
|
||||
v-model="queryParams.projectNature"
|
||||
placeholder="请选择项目建设类型"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.project_build_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
<el-select v-model="queryParams.projectNature" placeholder="请选择项目建设类型" clearable>
|
||||
<el-option v-for="dict in dict.type.project_build_type" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="重要等级" prop="weightType">
|
||||
<el-select
|
||||
v-model="queryParams.weightType"
|
||||
placeholder="请选择重要等级"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.sur_project_weight"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
<el-select v-model="queryParams.weightType" placeholder="请选择重要等级" clearable>
|
||||
<el-option v-for="dict in dict.type.sur_project_weight" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="责任主体" prop="deptId" v-hasPermi="['project:project:zgs']">
|
||||
<el-select v-model="queryParams.deptId" placeholder="请选择责任主体" clearable>
|
||||
<el-option
|
||||
v-for="dict in depts"
|
||||
:key="dict.deptId"
|
||||
:label="dict.deptName"
|
||||
:value="dict.deptId"
|
||||
></el-option>
|
||||
<el-option v-for="dict in depts" :key="dict.deptId" :label="dict.deptName" :value="dict.deptId"></el-option>
|
||||
</el-select>
|
||||
</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-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['project:surProject:add']"
|
||||
>新增</el-button
|
||||
>
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
||||
v-hasPermi="['project:surProject:add']">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['project:surProject:edit']"
|
||||
>修改</el-button
|
||||
>
|
||||
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
|
||||
v-hasPermi="['project:surProject:edit']">修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['project:surProject:remove']"
|
||||
>删除</el-button
|
||||
>
|
||||
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
|
||||
v-hasPermi="['project:surProject:remove']">删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['project:surProject:export']"
|
||||
>导出</el-button
|
||||
>
|
||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
||||
v-hasPermi="['project:surProject:export']">导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="surProjectList"
|
||||
@selection-change="handleSelectionChange" stripe
|
||||
>
|
||||
<el-table v-loading="loading" :data="surProjectList" @selection-change="handleSelectionChange" stripe>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column
|
||||
label="项目名称"
|
||||
align="left"
|
||||
prop="projectName"
|
||||
width="200"
|
||||
class-name="small-padding fixed-width"
|
||||
fixed="left"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column label="项目名称" align="left" prop="projectName" width="200" class-name="small-padding fixed-width"
|
||||
fixed="left" show-overflow-tooltip />
|
||||
<el-table-column label="责任主体" align="center" prop="deptName" />
|
||||
<el-table-column
|
||||
label="父级项目"
|
||||
align="left"
|
||||
prop="paretProjectName"
|
||||
width="200"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
label="项目简称"
|
||||
align="left"
|
||||
prop="simpleName"
|
||||
width="200"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column label="父级项目" align="left" prop="paretProjectName" width="200" show-overflow-tooltip />
|
||||
<el-table-column label="项目简称" align="left" prop="simpleName" width="200" show-overflow-tooltip />
|
||||
<el-table-column label="项目分类" align="center" prop="projectType">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag
|
||||
:options="dict.type.project_category"
|
||||
:value="scope.row.projectType"
|
||||
/>
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.project_category" :value="scope.row.projectType" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="项目等级" align="center" prop="projiectLevel">
|
||||
|
|
@ -199,353 +88,150 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="项目区域" align="center" prop="projectRegionalName" />
|
||||
<el-table-column
|
||||
label="进度展示"
|
||||
align="center"
|
||||
v-if="checkPermi(['project:surProject:progressVisible'])"
|
||||
>
|
||||
<el-table-column label="进度展示" align="center" v-if="checkPermi(['project:surProject:progressVisible'])">
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
v-model="scope.row.progressVisible"
|
||||
active-value="0"
|
||||
inactive-value="1"
|
||||
@change="setVisibleStatus(scope.row, $event)"
|
||||
></el-switch>
|
||||
<el-switch v-model="scope.row.progressVisible" active-value="0" inactive-value="1"
|
||||
@change="setVisibleStatus(scope.row, $event)"></el-switch>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="项目排序"
|
||||
align="center"
|
||||
width="150"
|
||||
v-if="checkPermi(['project:surProject:projectSort'])"
|
||||
>
|
||||
<el-table-column label="项目排序" align="center" width="150" v-if="checkPermi(['project:surProject:projectSort'])">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number
|
||||
size="mini"
|
||||
v-model="scope.row.projectSort"
|
||||
:min="1"
|
||||
:max="999"
|
||||
@change="setProjectSort(scope.row, $event)"
|
||||
></el-input-number>
|
||||
<el-input-number size="mini" v-model="scope.row.projectSort" :min="1" :max="999"
|
||||
@change="setProjectSort(scope.row, $event)"></el-input-number>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="建设类型"
|
||||
align="left"
|
||||
prop="projectNature"
|
||||
width="120"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<el-table-column label="建设类型" align="left" prop="projectNature" width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<dict-tag
|
||||
:options="dict.type.project_build_type"
|
||||
:value="scope.row.projectNature"
|
||||
/>
|
||||
<dict-tag :options="dict.type.project_build_type" :value="scope.row.projectNature" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="重要等级"
|
||||
align="left"
|
||||
prop="weightType"
|
||||
width="120"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<el-table-column label="重要等级" align="left" prop="weightType" width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<dict-tag
|
||||
:options="dict.type.sur_project_weight"
|
||||
:value="scope.row.weightType"
|
||||
/>
|
||||
<dict-tag :options="dict.type.sur_project_weight" :value="scope.row.weightType" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="项目地址"
|
||||
align="left"
|
||||
prop="projectAddress"
|
||||
width="200"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
label="项目负责人"
|
||||
align="center"
|
||||
prop="projectPerson"
|
||||
width="100"
|
||||
/>
|
||||
<el-table-column
|
||||
label="负责人电话"
|
||||
align="center"
|
||||
prop="projectPhone"
|
||||
width="110"
|
||||
/>
|
||||
<el-table-column label="项目地址" align="left" prop="projectAddress" width="200" show-overflow-tooltip />
|
||||
<el-table-column label="项目负责人" align="center" prop="projectPerson" width="100" />
|
||||
<el-table-column label="负责人电话" align="center" prop="projectPhone" width="110" />
|
||||
<el-table-column label="工程期限" align="center" prop="projectTimeLimit" />
|
||||
<el-table-column label="总投资" align="center" prop="totalInvestment" />
|
||||
<el-table-column label="开累产值" align="center" prop="totalOutputValue" />
|
||||
<el-table-column
|
||||
label="计划完成时间"
|
||||
align="center"
|
||||
prop="plannedCompletionTime"
|
||||
width="120"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<el-table-column label="计划完成时间" align="center" prop="plannedCompletionTime" width="120" show-overflow-tooltip>
|
||||
<template slot-scope="{ row }">{{ row.plannedCompletionTime }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="计划开工时间"
|
||||
align="center"
|
||||
prop="scheduledStartTime"
|
||||
width="120"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<el-table-column label="计划开工时间" align="center" prop="scheduledStartTime" width="120" show-overflow-tooltip>
|
||||
<template slot-scope="{ row }">{{ row.scheduledStartTime }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="实际开工时间"
|
||||
align="center"
|
||||
prop="actualOperatingTime"
|
||||
width="120"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<el-table-column label="实际开工时间" align="center" prop="actualOperatingTime" width="120" show-overflow-tooltip>
|
||||
<template slot-scope="{ row }">{{ row.actualOperatingTime }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="实际完工时间"
|
||||
align="center"
|
||||
prop="actualCompletionTime"
|
||||
width="120"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<el-table-column label="实际完工时间" align="center" prop="actualCompletionTime" width="120" show-overflow-tooltip>
|
||||
<template slot-scope="{ row }">{{ row.actualCompletionTime }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="合同总额" align="center" prop="contractAmount" width="80" />
|
||||
<el-table-column label="付款金额" align="center" prop="paidAmount" width="80" />
|
||||
<el-table-column
|
||||
label="挂账金额"
|
||||
align="center"
|
||||
prop="onAccountAmount"
|
||||
width="80"
|
||||
/>
|
||||
<el-table-column label="挂账金额" align="center" prop="onAccountAmount" width="80" />
|
||||
<el-table-column label="劳务人员" align="center" prop="servicePersonnel" />
|
||||
<el-table-column label="监理人员" align="center" prop="supervisorPersonnel" />
|
||||
<el-table-column label="总包人员" align="center" prop="generalContractor" />
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
class-name="small-padding fixed-width"
|
||||
fixed="right"
|
||||
width="240"
|
||||
>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="240">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-time"
|
||||
@click="prjProcessMgr(scope.row)"
|
||||
v-hasPermi="['project:surProject:edit']"
|
||||
>进度管理</el-button
|
||||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['project:surProject:edit']"
|
||||
>修改项目</el-button
|
||||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-user-solid"
|
||||
@click="handleProjectUserinfo(scope.row)"
|
||||
v-hasPermi="['project:surProjectUserInfo:list']"
|
||||
>项目人员</el-button
|
||||
>
|
||||
<el-dropdown
|
||||
size="mini"
|
||||
@command="(command) => handleCommand(command, scope.row)"
|
||||
v-hasPermi="[
|
||||
'project:assess:list',
|
||||
'project:build_node_data:list',
|
||||
'project:projectChecking:list',
|
||||
'work:workTrain:list',
|
||||
'work:emergencyDrill:list',
|
||||
'project:surProjectInsurance:list',
|
||||
'project:surProjectSpecial:list',
|
||||
'project:projectMeasure:list',
|
||||
'project:materialSeal:list',
|
||||
'project:projectDeptWroks:list',
|
||||
'project:surProjectAttendance:add',
|
||||
'video:videoConfig:list',
|
||||
'video:aiBoxProjectConfig:list',
|
||||
'project:checkDetection:list',
|
||||
'project:costOutput:edit',
|
||||
'project:projectStandard:edit',
|
||||
'project:attendanceWorker:list',
|
||||
'project:attendance:list',
|
||||
'project:surProject:remove',
|
||||
]"
|
||||
>
|
||||
<el-button size="mini" type="text" icon="el-icon-d-arrow-right"
|
||||
>更多操作</el-button
|
||||
>
|
||||
<el-button size="mini" type="text" icon="el-icon-time" @click="prjProcessMgr(scope.row)"
|
||||
v-hasPermi="['project:surProject:edit']">进度管理</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['project:surProject:edit']">修改项目</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-user-solid" @click="handleProjectUserinfo(scope.row)"
|
||||
v-hasPermi="['project:surProjectUserInfo:list']">项目人员</el-button>
|
||||
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="[
|
||||
'project:assess:list',
|
||||
'project:build_node_data:list',
|
||||
'project:projectChecking:list',
|
||||
'work:workTrain:list',
|
||||
'work:emergencyDrill:list',
|
||||
'project:surProjectInsurance:list',
|
||||
'project:surProjectSpecial:list',
|
||||
'project:projectMeasure:list',
|
||||
'project:materialSeal:list',
|
||||
'project:projectDeptWroks:list',
|
||||
'project:surProjectAttendance:add',
|
||||
'video:videoConfig:list',
|
||||
'video:aiBoxProjectConfig:list',
|
||||
'project:checkDetection:list',
|
||||
'project:costOutput:edit',
|
||||
'project:projectStandard:edit',
|
||||
'project:attendanceWorker:list',
|
||||
'project:attendance:list',
|
||||
'project:surProject:remove',
|
||||
'project:projectCommittee:list',
|
||||
]">
|
||||
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多操作</el-button>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item
|
||||
command="handleAssess"
|
||||
icon="el-icon-coordinate"
|
||||
v-hasPermi="['project:assess:list']"
|
||||
>季度考核管理</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleBuildNode"
|
||||
icon="el-icon-data-analysis"
|
||||
v-hasPermi="['project:build_node_data:list']"
|
||||
>计划节点管理</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item v-if="1==2"
|
||||
command="handleDesign"
|
||||
icon="el-icon-orange"
|
||||
v-hasPermi="['project:projectDesign:list']"
|
||||
>设计管理</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleProjectChecking"
|
||||
icon="el-icon-s-help"
|
||||
v-hasPermi="['project:projectChecking:list']"
|
||||
>举牌验收管理</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleWorkTrain"
|
||||
icon="el-icon-notebook-2"
|
||||
v-hasPermi="['work:workTrain:list']"
|
||||
>项目教育培训</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleEmergencyDrill"
|
||||
icon="el-icon-first-aid-kit"
|
||||
v-hasPermi="['work:emergencyDrill:list']"
|
||||
>项目应急演练</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleProjectInsurance"
|
||||
icon="el-icon-star-on"
|
||||
v-hasPermi="['project:surProjectInsurance:list']"
|
||||
>项目保险管理</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleProjectSpecial"
|
||||
icon="el-icon-user"
|
||||
v-hasPermi="['project:surProjectSpecial:list']"
|
||||
>项目特种人员</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleProjectMeasure"
|
||||
icon="el-icon-s-operation"
|
||||
v-hasPermi="['project:projectMeasure:list']"
|
||||
>实测实量管理</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleProjectMaterialSeal"
|
||||
icon="el-icon-s-ticket"
|
||||
v-hasPermi="['project:materialSeal:list']"
|
||||
>材料封样管理</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleProjectDeptWroks"
|
||||
icon="el-icon-s-custom"
|
||||
v-hasPermi="['project:projectDeptWroks:list']"
|
||||
>在岗人员管理</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleAttendanceData"
|
||||
icon="el-icon-s-grid"
|
||||
v-hasPermi="['project:attendance:list']"
|
||||
>劳务实名管理</el-dropdown-item>
|
||||
<el-dropdown-item command="handleAssess" icon="el-icon-coordinate"
|
||||
v-hasPermi="['project:assess:list']">季度考核管理</el-dropdown-item>
|
||||
<el-dropdown-item command="handleBuildNode" icon="el-icon-data-analysis"
|
||||
v-hasPermi="['project:build_node_data:list']">计划节点管理</el-dropdown-item>
|
||||
<el-dropdown-item command="handleCommittee" icon="el-icon-s-order" v-if="1==2"
|
||||
v-hasPermi="['project:projectCommittee:list']">工委会管理</el-dropdown-item>
|
||||
<el-dropdown-item v-if="1 == 2" command="handleDesign" icon="el-icon-orange"
|
||||
v-hasPermi="['project:projectDesign:list']">设计管理</el-dropdown-item>
|
||||
<el-dropdown-item command="handleProjectChecking" icon="el-icon-s-help"
|
||||
v-hasPermi="['project:projectChecking:list']">举牌验收管理</el-dropdown-item>
|
||||
<el-dropdown-item command="handleWorkTrain" icon="el-icon-notebook-2"
|
||||
v-hasPermi="['work:workTrain:list']">项目教育培训</el-dropdown-item>
|
||||
<el-dropdown-item command="handleEmergencyDrill" icon="el-icon-first-aid-kit"
|
||||
v-hasPermi="['work:emergencyDrill:list']">项目应急演练</el-dropdown-item>
|
||||
<el-dropdown-item command="handleProjectInsurance" icon="el-icon-star-on"
|
||||
v-hasPermi="['project:surProjectInsurance:list']">项目保险管理</el-dropdown-item>
|
||||
<el-dropdown-item command="handleProjectSpecial" icon="el-icon-user"
|
||||
v-hasPermi="['project:surProjectSpecial:list']">项目特种人员</el-dropdown-item>
|
||||
<el-dropdown-item command="handleProjectMeasure" icon="el-icon-s-operation"
|
||||
v-hasPermi="['project:projectMeasure:list']">实测实量管理</el-dropdown-item>
|
||||
<el-dropdown-item command="handleProjectMaterialSeal" icon="el-icon-s-ticket"
|
||||
v-hasPermi="['project:materialSeal:list']">材料封样管理</el-dropdown-item>
|
||||
<el-dropdown-item command="handleProjectDeptWroks" icon="el-icon-s-custom"
|
||||
v-hasPermi="['project:projectDeptWroks:list']">在岗人员管理</el-dropdown-item>
|
||||
<el-dropdown-item command="handleAttendanceData" icon="el-icon-s-grid"
|
||||
v-hasPermi="['project:attendance:list']">劳务实名管理</el-dropdown-item>
|
||||
<!-- <el-dropdown-item
|
||||
command="handleProjectAttendance"
|
||||
icon="el-icon-trophy"
|
||||
v-hasPermi="['project:surProjectAttendance:add']"
|
||||
>今日出勤</el-dropdown-item
|
||||
> -->
|
||||
<el-dropdown-item
|
||||
command="handleVideoConfig"
|
||||
icon="el-icon-video-camera-solid"
|
||||
v-hasPermi="['video:videoConfig:list']"
|
||||
>视频配置</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleAiBoxVideoConfig"
|
||||
icon="el-icon-camera"
|
||||
v-hasPermi="['video:aiBoxProjectConfig:list']"
|
||||
>AI视频配置</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handlePrjPhotography"
|
||||
icon="el-icon-camera"
|
||||
v-hasPermi="['video:prjphotography:list']"
|
||||
>项目全景</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleCheckDetection"
|
||||
icon="el-icon-c-scale-to-original"
|
||||
v-hasPermi="['project:checkDetection:list']"
|
||||
>材料取样复试</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleCostOutput"
|
||||
icon="el-icon-money"
|
||||
v-hasPermi="['project:costOutput:edit']"
|
||||
>项目成本产值管理</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleStandard"
|
||||
icon="el-icon-s-grid"
|
||||
v-hasPermi="['project:projectStandard:list']"
|
||||
>标准化管理</el-dropdown-item>
|
||||
<el-dropdown-item
|
||||
command="handleDelete"
|
||||
icon="el-icon-delete"
|
||||
v-hasPermi="['project:surProject:remove']"
|
||||
>删除项目</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item command="handleVideoConfig" icon="el-icon-video-camera-solid"
|
||||
v-hasPermi="['video:videoConfig:list']">视频配置</el-dropdown-item>
|
||||
<el-dropdown-item command="handleAiBoxVideoConfig" icon="el-icon-camera"
|
||||
v-hasPermi="['video:aiBoxProjectConfig:list']">AI视频配置</el-dropdown-item>
|
||||
<el-dropdown-item command="handlePrjPhotography" icon="el-icon-camera"
|
||||
v-hasPermi="['video:prjphotography:list']">项目全景</el-dropdown-item>
|
||||
<el-dropdown-item command="handleCheckDetection" icon="el-icon-c-scale-to-original"
|
||||
v-hasPermi="['project:checkDetection:list']">材料取样复试</el-dropdown-item>
|
||||
<el-dropdown-item command="handleCostOutput" icon="el-icon-money"
|
||||
v-hasPermi="['project:costOutput:edit']">项目成本产值管理</el-dropdown-item>
|
||||
<el-dropdown-item command="handleStandard" icon="el-icon-s-grid"
|
||||
v-hasPermi="['project:projectStandard:list']">标准化管理</el-dropdown-item>
|
||||
<el-dropdown-item command="handleDelete" icon="el-icon-delete"
|
||||
v-hasPermi="['project:surProject:remove']">删除项目</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</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"
|
||||
v-if="open"
|
||||
:visible.sync="open"
|
||||
width="1200px"
|
||||
append-to-body
|
||||
custom-class="prj-suprj-edit-dialog"
|
||||
:close-on-click-modal="false"
|
||||
:close-on-press-escape="false"
|
||||
>
|
||||
<el-dialog :title="title" v-if="open" :visible.sync="open" width="1200px" append-to-body
|
||||
custom-class="prj-suprj-edit-dialog" :close-on-click-modal="false" :close-on-press-escape="false">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="责任主体" prop="deptId">
|
||||
<el-select
|
||||
v-model="form.deptId"
|
||||
placeholder="请选择责任主体"
|
||||
style="width: 100%"
|
||||
:disabled="getDeptIdDisabled()"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in depts"
|
||||
:key="dict.deptId"
|
||||
:label="dict.deptName"
|
||||
:value="dict.deptId"
|
||||
></el-option>
|
||||
<el-select v-model="form.deptId" placeholder="请选择责任主体" style="width: 100%"
|
||||
:disabled="getDeptIdDisabled()">
|
||||
<el-option v-for="dict in depts" :key="dict.deptId" :label="dict.deptName"
|
||||
:value="dict.deptId"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -556,10 +242,7 @@
|
|||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="父级项目" prop="paretProjectName">
|
||||
<el-input
|
||||
v-model="form.paretProjectName"
|
||||
placeholder="请输入父级项目名称"
|
||||
/>
|
||||
<el-input v-model="form.paretProjectName" placeholder="请输入父级项目名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -567,17 +250,9 @@
|
|||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="项目建设类型" prop="projectNature">
|
||||
<el-select
|
||||
v-model="form.projectNature"
|
||||
placeholder="请选择项目建设类型"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.project_build_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
<el-select v-model="form.projectNature" placeholder="请选择项目建设类型" style="width: 100%">
|
||||
<el-option v-for="dict in dict.type.project_build_type" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -588,19 +263,10 @@
|
|||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="项目分类" prop="projectType">
|
||||
<el-select
|
||||
v-model="form.projectType"
|
||||
placeholder="请选择项目分类"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.project_category"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select> </el-form-item
|
||||
></el-col>
|
||||
<el-select v-model="form.projectType" placeholder="请选择项目分类" style="width: 100%">
|
||||
<el-option v-for="dict in dict.type.project_category" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value"></el-option>
|
||||
</el-select> </el-form-item></el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
|
|
@ -611,29 +277,16 @@
|
|||
<el-button @click="getMapInfo">选择经纬度</el-button>
|
||||
</div>
|
||||
<div style="margin-left: 12px; flex-grow: 1">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
placeholder="请输入地址"
|
||||
v-model="form.projectAddress"
|
||||
>
|
||||
<el-input type="textarea" :rows="3" placeholder="请输入地址" v-model="form.projectAddress">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="项目等级" prop="projiectLevel">
|
||||
<el-select
|
||||
v-model="form.projiectLevel"
|
||||
placeholder="请选择项目等级"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.project_level"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
<el-select v-model="form.projiectLevel" placeholder="请选择项目等级" style="width: 100%">
|
||||
<el-option v-for="dict in dict.type.project_level" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -655,71 +308,41 @@
|
|||
</el-row>
|
||||
|
||||
<el-row>
|
||||
|
||||
|
||||
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item label="计划完成时间" prop="plannedCompletionTime">
|
||||
<el-date-picker
|
||||
v-model="form.plannedCompletionTime"
|
||||
type="month"
|
||||
placeholder="选择计划完成时间"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-date-picker v-model="form.plannedCompletionTime" type="month" placeholder="选择计划完成时间"
|
||||
style="width: 100%">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="计划开工时间" prop="scheduledStartTime">
|
||||
<el-date-picker
|
||||
v-model="form.scheduledStartTime"
|
||||
type="month"
|
||||
placeholder="选择计划开工时间"
|
||||
style="width: 100%"
|
||||
>
|
||||
</el-date-picker> </el-form-item
|
||||
></el-col>
|
||||
<el-date-picker v-model="form.scheduledStartTime" type="month" placeholder="选择计划开工时间" style="width: 100%">
|
||||
</el-date-picker> </el-form-item></el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="实际开工时间" prop="actualOperatingTime">
|
||||
<el-date-picker
|
||||
v-model="form.actualOperatingTime"
|
||||
type="month"
|
||||
placeholder="选择实际开工时间"
|
||||
style="width: 100%"
|
||||
>
|
||||
</el-date-picker> </el-form-item
|
||||
></el-col>
|
||||
<el-date-picker v-model="form.actualOperatingTime" type="month" placeholder="选择实际开工时间"
|
||||
style="width: 100%">
|
||||
</el-date-picker> </el-form-item></el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
|
||||
|
||||
<el-col :span="8"
|
||||
><el-form-item label="实际完工时间" prop="actualCompletionTime">
|
||||
<el-date-picker
|
||||
v-model="form.actualCompletionTime"
|
||||
type="month"
|
||||
placeholder="选择实际完工时间"
|
||||
style="width: 100%"
|
||||
>
|
||||
</el-date-picker> </el-form-item
|
||||
></el-col>
|
||||
<el-col :span="8"
|
||||
><el-form-item label="形象进度" prop="projectSchedule">
|
||||
<el-select
|
||||
v-model="form.projectSchedule"
|
||||
placeholder="请选择形象进度"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.sur_project_xmjd"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
|
||||
|
||||
<el-col :span="8"><el-form-item label="实际完工时间" prop="actualCompletionTime">
|
||||
<el-date-picker v-model="form.actualCompletionTime" type="month" placeholder="选择实际完工时间"
|
||||
style="width: 100%">
|
||||
</el-date-picker> </el-form-item></el-col>
|
||||
<el-col :span="8"><el-form-item label="形象进度" prop="projectSchedule">
|
||||
<el-select v-model="form.projectSchedule" placeholder="请选择形象进度" style="width: 100%">
|
||||
<el-option v-for="dict in dict.type.sur_project_xmjd" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
</el-row>
|
||||
<!-- <el-row>
|
||||
<el-col :span="8"
|
||||
><el-form-item label="劳务人员数" prop="servicePersonnel">
|
||||
|
|
@ -744,12 +367,7 @@
|
|||
>
|
||||
</el-row> -->
|
||||
<el-form-item label="项目概述" prop="projectSummarize">
|
||||
<el-input
|
||||
v-model="form.projectSummarize"
|
||||
type="textarea"
|
||||
:rows="5"
|
||||
placeholder="请输入内容"
|
||||
/>
|
||||
<el-input v-model="form.projectSummarize" type="textarea" :rows="5" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||
|
|
@ -761,11 +379,7 @@
|
|||
</div>
|
||||
</el-dialog>
|
||||
<ProjectScheduleDlg ref="prjSchDlg"></ProjectScheduleDlg>
|
||||
<projectUserInfoDrawer
|
||||
size="50%"
|
||||
:visible.sync="projectUserInfoDrawerVisible"
|
||||
:form-data="formData"
|
||||
/>
|
||||
<projectUserInfoDrawer size="50%" :visible.sync="projectUserInfoDrawerVisible" :form-data="formData" />
|
||||
<assess-drawer ref="assessDrawer"></assess-drawer>
|
||||
<baidu-map ref="map" @success="mapSuccess"></baidu-map>
|
||||
<build-node-drawer ref="nodeDrawer"></build-node-drawer>
|
||||
|
|
@ -783,9 +397,10 @@
|
|||
<checkDetectionDrawer ref="checkDetection"></checkDetectionDrawer>
|
||||
<standardDrawer ref="standard"></standardDrawer>
|
||||
<attendanceDataDrawer ref="attendanceData"></attendanceDataDrawer>
|
||||
<aiBoxVideoConfigDrawer ref="aiBoxVideoConfigDrawer"></aiBoxVideoConfigDrawer>
|
||||
<prjPhotographyDrawer ref="prjPhotographyDrawer"></prjPhotographyDrawer>
|
||||
<aiBoxVideoConfigDrawer ref="aiBoxVideoConfigDrawer"></aiBoxVideoConfigDrawer>
|
||||
<prjPhotographyDrawer ref="prjPhotographyDrawer"></prjPhotographyDrawer>
|
||||
<projectDesignDrawer ref="designDrawer"></projectDesignDrawer>
|
||||
<CommitteeDrawer ref="committeeDrawer"></CommitteeDrawer>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -821,6 +436,7 @@ import attendanceDataDrawer from '@/views/project/attendance/attendanceDrawer.vu
|
|||
import aiBoxVideoConfigDrawer from '@/views/video/aiBoxProjectConfig/aiBoxVideoConfigDrawer';
|
||||
import prjPhotographyDrawer from '@/views/video/prjphotography/prjPhotographyDrawer.vue'
|
||||
import projectDesignDrawer from '@/views/project/projectDesign/projectDesignDrawer.vue';
|
||||
import CommitteeDrawer from '@/views/project/projectCommittee/projectCommitteeDrawer.vue'
|
||||
import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
|
||||
|
||||
export default {
|
||||
|
|
@ -845,9 +461,10 @@ export default {
|
|||
checkDetectionDrawer,
|
||||
standardDrawer,
|
||||
attendanceDataDrawer,
|
||||
aiBoxVideoConfigDrawer,
|
||||
aiBoxVideoConfigDrawer,
|
||||
prjPhotographyDrawer,
|
||||
projectDesignDrawer
|
||||
projectDesignDrawer,
|
||||
CommitteeDrawer
|
||||
},
|
||||
dicts: [
|
||||
"sur_project_xmjd",
|
||||
|
|
@ -1059,7 +676,7 @@ export default {
|
|||
this.handleDelete(row);
|
||||
break;
|
||||
case "handleDesign":
|
||||
this.$refs.designDrawer.show(row);
|
||||
this.$refs.designDrawer.show(row);
|
||||
break;
|
||||
case "handleAssess":
|
||||
this.$refs.assessDrawer.show(row);
|
||||
|
|
@ -1105,7 +722,7 @@ export default {
|
|||
break;
|
||||
case "handleStandard":
|
||||
this.$refs.standard.show(row);
|
||||
break;
|
||||
break;
|
||||
case "handleAttendanceData":
|
||||
this.$refs.attendanceData.show(row);
|
||||
break;
|
||||
|
|
@ -1115,6 +732,9 @@ export default {
|
|||
case "handlePrjPhotography":
|
||||
this.$refs.prjPhotographyDrawer.show(row);
|
||||
break;
|
||||
case "handleCommittee":
|
||||
this.$refs.committeeDrawer.show(row);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
@ -1164,7 +784,7 @@ export default {
|
|||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => {});
|
||||
.catch(() => { });
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
|
|
@ -1225,6 +845,7 @@ export default {
|
|||
.prj-suprj-edit-dialog {
|
||||
.el-dialog__body {
|
||||
padding-bottom: 0px;
|
||||
|
||||
.fi-longitude {
|
||||
.el-form-item__content {
|
||||
display: flex;
|
||||
|
|
|
|||
|
|
@ -15,8 +15,6 @@ CREATE VIEW vw_smz_ssp_problemmodify_audit AS (
|
|||
a.*, a.updateTime AS audittime,
|
||||
b.deptId,
|
||||
b.projectName as prjName,
|
||||
b.projectType as proType,
|
||||
b.progressVisible as progressVisible,
|
||||
u.nick_name AS createBy
|
||||
FROM
|
||||
smz_ssp_problemmodify a
|
||||
|
|
@ -54,9 +52,7 @@ CREATE VIEW vw_flow_all AS (
|
|||
DEF.KEY_ AS procDefKey,
|
||||
sp.id AS businessKey,
|
||||
sp.deptId as businessDeptId,
|
||||
sp.projectType as businessType,
|
||||
sp.projectName AS businessKeyName,
|
||||
sp.progressVisible AS businessVisible,
|
||||
ru.user_id AS startUserId,
|
||||
ru.nick_name AS startUserName,
|
||||
rd.dept_name AS startDeptName,
|
||||
|
|
@ -111,9 +107,7 @@ CREATE VIEW vw_flow_await AS (SELECT
|
|||
DEF.KEY_ AS procDefKey,
|
||||
sp.id AS businessKey,
|
||||
sp.deptId AS businessDeptId,
|
||||
sp.projectType AS businessType,
|
||||
sp.projectName AS businessKeyName,
|
||||
sp.progressVisible AS businessVisible,
|
||||
ru.user_id AS startUserId,
|
||||
ru.nick_name AS startUserName,
|
||||
rd.dept_name AS startDeptName,
|
||||
|
|
@ -155,10 +149,52 @@ WHERE
|
|||
-- )
|
||||
-- )
|
||||
|
||||
|
||||
##审批意见
|
||||
DROP view vw_flow_comment;
|
||||
CREATE VIEW vw_flow_comment AS (
|
||||
SELECT
|
||||
hc.ID_ AS commentId,
|
||||
hc.TYPE_ AS commentType,
|
||||
ht.ID_ AS taskId,
|
||||
ht.NAME_ AS taskName,
|
||||
ht.REV_ AS rev,
|
||||
CASE
|
||||
WHEN hc.TYPE_ = 1
|
||||
AND ht.REV_ != 2 THEN
|
||||
'通过'
|
||||
WHEN hc.TYPE_ != 1 THEN
|
||||
'驳回'
|
||||
END AS commentResult,
|
||||
ht.PROC_INST_ID_ AS procInstId,
|
||||
ht.TASK_DEF_KEY_ AS taskDefKey,
|
||||
ht.EXECUTION_ID_ AS executionId,
|
||||
ht.DELETE_REASON_ AS deleteReason,
|
||||
DATE_FORMAT(
|
||||
ht.START_TIME_,
|
||||
'%Y-%m-%d %H:%i:%S'
|
||||
) AS startTime,
|
||||
DATE_FORMAT(
|
||||
ht.END_TIME_,
|
||||
'%Y-%m-%d %H:%i:%S'
|
||||
) AS endTime,
|
||||
ht.DURATION_ AS duration,
|
||||
hc.MESSAGE_ AS message,
|
||||
ru.nick_name AS assigneeName,
|
||||
rd.dept_name AS deptName,
|
||||
r.role_name as candidate
|
||||
FROM
|
||||
act_hi_taskinst ht
|
||||
LEFT JOIN act_hi_comment hc ON hc.TASK_ID_ = ht.ID_
|
||||
LEFT JOIN act_hi_identitylink hi on hi.TASK_ID_ = ht.ID_ and hi.TYPE_ = 'candidate'
|
||||
left JOIN sys_role r on r.role_id = hi.group_Id_
|
||||
LEFT JOIN sys_user ru ON ru.user_id = ht.ASSIGNEE_
|
||||
LEFT JOIN sys_dept rd ON rd.dept_id = ru.dept_id
|
||||
where hc.TYPE_ is null or hc.TYPE_!='event'
|
||||
)
|
||||
|
||||
##审批意见V2
|
||||
DROP view vw_flow_comment;
|
||||
CREATE VIEW vw_flow_comment AS (
|
||||
SELECT
|
||||
hc.ID_ AS commentId,
|
||||
hc.TYPE_ AS commentType,
|
||||
|
|
@ -228,9 +264,7 @@ DEF.END_TIME_ as finishTime,
|
|||
pd.KEY_ AS procDefKey,
|
||||
sp.id AS businessKey,
|
||||
sp.deptId AS businessDeptId,
|
||||
sp.projectType AS businessType,
|
||||
sp.projectName AS businessKeyName,
|
||||
sp.progressVisible AS businessVisible,
|
||||
ru.user_id AS startUserId,
|
||||
ru.nick_name AS startUserName,
|
||||
rd.dept_name AS startDeptName,
|
||||
|
|
@ -245,7 +279,6 @@ LEFT JOIN sys_dept rd ON rd.dept_id = ru.dept_id
|
|||
WHERE
|
||||
RES.ASSIGNEE_ is not null and RES.END_TIME_ is not null)
|
||||
|
||||
|
||||
##君哥其它sql
|
||||
CREATE VIEW vw_smz_ssp_problemmodify_audit
|
||||
AS
|
||||
|
|
@ -260,6 +293,8 @@ SELECT * FROM smz_ssp_auditinfo WHERE id IN(SELECT MAX(id) FROM smz_ssp_auditinf
|
|||
GROUP BY mainid)
|
||||
) a ON p.id=a.mainid
|
||||
|
||||
130735741
|
||||
559939996
|
||||
|
||||
CREATE VIEW vw_sur_project_build_node_data_all
|
||||
AS
|
||||
|
|
|
|||
|
|
@ -0,0 +1,218 @@
|
|||
/*
|
||||
SQLyog Ultimate v13.1.1 (64 bit)
|
||||
MySQL - 8.0.22-cynos : Database - yanzhu_jh
|
||||
*********************************************************************
|
||||
*/
|
||||
|
||||
/*!40101 SET NAMES utf8 */;
|
||||
|
||||
/*!40101 SET SQL_MODE=''*/;
|
||||
|
||||
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
|
||||
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
|
||||
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
|
||||
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
|
||||
/*Table structure for table `base_mag` */
|
||||
|
||||
DROP TABLE IF EXISTS `base_mag`;
|
||||
|
||||
CREATE TABLE `base_mag` (
|
||||
`id` int NOT NULL AUTO_INCREMENT,
|
||||
`name` varchar(255) DEFAULT NULL COMMENT '期刊名称',
|
||||
`imgs` varchar(512) DEFAULT NULL COMMENT '图片',
|
||||
`ord` int DEFAULT NULL COMMENT '排序',
|
||||
`remark` varchar(255) DEFAULT NULL COMMENT '备注',
|
||||
`is_del` int DEFAULT '0',
|
||||
`create_by` varchar(255) DEFAULT NULL,
|
||||
`create_time` datetime DEFAULT NULL,
|
||||
`update_by` varchar(255) DEFAULT NULL,
|
||||
`update_time` datetime DEFAULT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='期刊';
|
||||
|
||||
/*Data for the table `base_mag` */
|
||||
|
||||
LOCK TABLES `base_mag` WRITE;
|
||||
|
||||
UNLOCK TABLES;
|
||||
|
||||
/*Table structure for table `base_mag_detail` */
|
||||
|
||||
DROP TABLE IF EXISTS `base_mag_detail`;
|
||||
|
||||
CREATE TABLE `base_mag_detail` (
|
||||
`id` int NOT NULL AUTO_INCREMENT,
|
||||
`magid` int DEFAULT NULL COMMENT '期刊id',
|
||||
`topic` int DEFAULT NULL COMMENT '栏目字典mag_topic',
|
||||
`title` varchar(512) DEFAULT NULL COMMENT '标题',
|
||||
`deptid` int DEFAULT NULL COMMENT '总包编号',
|
||||
`authorName` varchar(255) DEFAULT NULL COMMENT '作者',
|
||||
`authorPhone` varchar(50) DEFAULT NULL COMMENT '作者电话',
|
||||
`ord` int DEFAULT NULL COMMENT '排序号',
|
||||
`images` varchar(1024) DEFAULT NULL COMMENT '图片',
|
||||
`content` text COMMENT '正文',
|
||||
`remark` varchar(255) DEFAULT NULL COMMENT '备注',
|
||||
`is_del` int DEFAULT '0',
|
||||
`create_by` varchar(255) DEFAULT NULL,
|
||||
`create_time` datetime DEFAULT NULL,
|
||||
`update_by` varchar(255) DEFAULT NULL,
|
||||
`update_time` datetime DEFAULT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='期刊详情';
|
||||
|
||||
/*Data for the table `base_mag_detail` */
|
||||
|
||||
LOCK TABLES `base_mag_detail` WRITE;
|
||||
|
||||
UNLOCK TABLES;
|
||||
|
||||
/*Table structure for table `base_working_committee` */
|
||||
|
||||
DROP TABLE IF EXISTS `base_working_committee`;
|
||||
|
||||
CREATE TABLE `base_working_committee` (
|
||||
`id` int NOT NULL AUTO_INCREMENT,
|
||||
`name` varchar(255) DEFAULT NULL COMMENT '名称',
|
||||
`files` varchar(1024) DEFAULT NULL COMMENT '文件',
|
||||
`ord` int DEFAULT NULL COMMENT '顺序',
|
||||
`remark` varchar(255) DEFAULT NULL,
|
||||
`create_by` varchar(255) DEFAULT NULL,
|
||||
`create_time` datetime DEFAULT NULL,
|
||||
`update_by` varchar(255) DEFAULT NULL,
|
||||
`update_time` datetime DEFAULT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='工委会';
|
||||
|
||||
/*Data for the table `base_working_committee` */
|
||||
|
||||
LOCK TABLES `base_working_committee` WRITE;
|
||||
|
||||
UNLOCK TABLES;
|
||||
|
||||
/*Table structure for table `sur_project_working_committee` */
|
||||
|
||||
DROP TABLE IF EXISTS `sur_project_working_committee`;
|
||||
|
||||
CREATE TABLE `sur_project_working_committee` (
|
||||
`id` int NOT NULL AUTO_INCREMENT,
|
||||
`projectId` int DEFAULT NULL COMMENT '项目ID',
|
||||
`workingType` int DEFAULT NULL COMMENT '分类字典project_working_type',
|
||||
`costName` varchar(255) DEFAULT NULL COMMENT '成本名称',
|
||||
`money` double DEFAULT NULL COMMENT '金额(万元)',
|
||||
`remark` varchar(255) DEFAULT NULL,
|
||||
`create_by` varchar(255) DEFAULT NULL,
|
||||
`create_time` datetime DEFAULT NULL,
|
||||
`update_by` varchar(255) DEFAULT NULL,
|
||||
`update_time` datetime DEFAULT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='项目工委会信息';
|
||||
|
||||
/*Data for the table `sur_project_working_committee` */
|
||||
|
||||
LOCK TABLES `sur_project_working_committee` WRITE;
|
||||
|
||||
UNLOCK TABLES;
|
||||
|
||||
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
|
||||
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
|
||||
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
|
||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
-- 菜单 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('期刊列表', '2108', '1', 'mag', 'base/mag/index', 1, 0, 'C', '0', '0', 'base:mag:list', '#', 'admin', sysdate(), '', null, '期刊列表菜单');
|
||||
|
||||
-- 按钮父菜单ID
|
||||
SELECT @parentId := LAST_INSERT_ID();
|
||||
|
||||
-- 按钮 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('期刊列表查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'base:mag:query', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('期刊列表新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'base:mag:add', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('期刊列表修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'base:mag:edit', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('期刊列表删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'base:mag:remove', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('期刊列表导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'base:mag:export', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
|
||||
-- 菜单 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('期刊详情', '2108', '1', 'magDetail', 'base/magDetail/index', 1, 0, 'C', '0', '0', 'base:magDetail:list', '#', 'admin', sysdate(), '', null, '期刊详情菜单');
|
||||
|
||||
-- 按钮父菜单ID
|
||||
SELECT @parentId := LAST_INSERT_ID();
|
||||
|
||||
-- 按钮 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('期刊详情查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'base:magDetail:query', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('期刊详情新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'base:magDetail:add', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('期刊详情修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'base:magDetail:edit', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('期刊详情删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'base:magDetail:remove', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('期刊详情导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'base:magDetail:export', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
-- 菜单 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('工委会列表', '2108', '1', 'committee', 'base/committee/index', 1, 0, 'C', '0', '0', 'base:committee:list', '#', 'admin', sysdate(), '', null, '工委会列表菜单');
|
||||
|
||||
-- 按钮父菜单ID
|
||||
SELECT @parentId := LAST_INSERT_ID();
|
||||
|
||||
-- 按钮 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('工委会列表查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'base:committee:query', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('工委会列表新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'base:committee:add', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('工委会列表修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'base:committee:edit', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('工委会列表删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'base:committee:remove', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('工委会列表导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'base:committee:export', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
|
||||
-- 菜单 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('工委会管理', '2108', '1', 'projectCommittee', 'project/projectCommittee/index', 1, 0, 'C', '0', '0', 'project:projectCommittee:list', '#', 'admin', sysdate(), '', null, '工委会管理菜单');
|
||||
|
||||
-- 按钮父菜单ID
|
||||
SELECT @parentId := LAST_INSERT_ID();
|
||||
|
||||
-- 按钮 SQL
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('工委会管理查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'project:projectCommittee:query', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('工委会管理新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'project:projectCommittee:add', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('工委会管理修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'project:projectCommittee:edit', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('工委会管理删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'project:projectCommittee:remove', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
|
||||
values('工委会管理导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'project:projectCommittee:export', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ public class ProjectBuildNodeController extends BaseController {
|
|||
}
|
||||
|
||||
List<SurProjectBuildNodeData> list = surProjectBuildNodeDataService.selectScheduledAlerts(where);
|
||||
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
|
||||
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
|
|
@ -69,7 +69,7 @@ public class ProjectBuildNodeController extends BaseController {
|
|||
}
|
||||
|
||||
List<SurProjectBuildNodeData> list = surProjectBuildNodeDataService.countCompletionRate(where);
|
||||
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
|
||||
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ public class ProjectBuildNodeController extends BaseController {
|
|||
return AjaxResult.success(obj);
|
||||
}
|
||||
List<SurProjectBuildNodeData> list = surProjectBuildNodeDataService.selectCurrent(where);
|
||||
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
|
||||
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
|
|
@ -110,7 +110,7 @@ public class ProjectBuildNodeController extends BaseController {
|
|||
}
|
||||
surProjectBuildNodeDataService.addProjectNodes(projectId);
|
||||
list=surProjectBuildNodeDataService.selectSurProjectBuildNodeDataList(surProjectBuildNodeData);
|
||||
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
|
||||
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
|
|
@ -127,7 +127,7 @@ public class ProjectBuildNodeController extends BaseController {
|
|||
return AjaxResult.success(obj);
|
||||
}
|
||||
List list=surProjectBuildNodeDataService.queryByProjectType(type);
|
||||
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
|
||||
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
|
|
@ -140,7 +140,7 @@ public class ProjectBuildNodeController extends BaseController {
|
|||
return AjaxResult.success(obj);
|
||||
}
|
||||
List list=surProjectBuildNodeDataService.queryFinishProject(projectId);
|
||||
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
|
||||
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package com.yanzhu.jh.bigscreen.web.controller;
|
||||
|
||||
import cn.hutool.core.date.DateTime;
|
||||
import cn.hutool.core.date.DateUnit;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.ruoyi.common.constant.Constants;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
|
|
@ -17,6 +20,7 @@ import org.aspectj.weaver.loadtime.Aj;
|
|||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
|
|
@ -52,7 +56,14 @@ public class ProjectController extends BaseController {
|
|||
if(deptId!=null && deptId.longValue()>0){
|
||||
surProject.setDeptId(deptId);
|
||||
}
|
||||
return success(isurProjectService.selectSurProjectList(surProject));
|
||||
List<SurProject> list=isurProjectService.selectSurProjectList(surProject);
|
||||
for (SurProject p :list){
|
||||
//DateTime dt1= DateUtil.parse(p.getScheduledStartTime());
|
||||
//DateTime dt2=DateUtil.parse(p.getPlannedCompletionTime());
|
||||
//long days= DateUtil.between(dt1,dt2, DateUnit.DAY);
|
||||
//p.setProjectTimeLimit(days);
|
||||
}
|
||||
return success(list);
|
||||
}
|
||||
|
||||
@GetMapping("/getProjectBuildNode")
|
||||
|
|
|
|||
|
|
@ -214,7 +214,7 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
|
|||
sdata.setCompanyTypeId(group.getCompanyTypeId());
|
||||
//查询华筑的分组信息
|
||||
if("huazhu".equals(sdata.getVendorsCode())){
|
||||
sdata.setWorkerGender(sdata.getWorkerGender()==1?0l:1l);
|
||||
sdata.setWorkerGender(sdata.getWorkerGender());
|
||||
sdata.setCompanyTypeId(getHuazhuCompanyTypeId(group.getCompanyName()));//获取华筑的分包商类型
|
||||
}
|
||||
if("jgw".equals(sdata.getVendorsCode())){
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
|
||||
SELECT 10 cost_type , SUM(spco.money) money FROM sur_project_cost_output spco
|
||||
left join sur_project sp on sp.id = spco.project_id
|
||||
WHERE (spco.cost_type=2 AND spco.YEAR <=#{year} ) and sp.isDel=0 and sp.progressVisible=0
|
||||
WHERE spco.cost_type=9 AND (spco.YEAR <#{year} or ( spco.Year =#{year} and spco.MONTH <= #{month})) and sp.isDel=0 and sp.progressVisible=0
|
||||
<if test="id!=null and id>0"> and sp.deptId = #{id}</if>
|
||||
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
|
||||
<if test="projectId!=null and projectId>0">
|
||||
|
|
|
|||
|
|
@ -126,13 +126,12 @@
|
|||
left join (
|
||||
select a.standard_type,count(1) cnt
|
||||
from sur_project_standard a ,sur_project sp
|
||||
where a.is_del =0 and a.project_id=sp.id
|
||||
where a.is_del =0 and a.project_id=sp.id and sp.progressVisible=0
|
||||
<if test="projectId!=null and projectId>0"> and a.project_id=#{projectId}</if>
|
||||
<if test="deptId!=null and deptId>0">
|
||||
and a.dept_Id= #{deptId}
|
||||
and sp.deptid= #{deptId}
|
||||
</if>
|
||||
<if test="proType != null and proType != '' "> and sp.projectType = #{proType}</if>
|
||||
<if test="activeName != null and activeName != ''"> and sp.progressVisible = 0</if>
|
||||
<if test="prjIds !=null and prjIds.size()>0">
|
||||
and a.project_id in
|
||||
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
|
||||
|
|
|
|||
|
|
@ -464,7 +464,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
select projectId,prjName,count(1) proble from vw_smz_ssp_problemmodify_audit
|
||||
where infoType=#{infoType} AND isDel=0
|
||||
<if test="projectId>0">and projectId=#{projectId}</if>
|
||||
<if test='proType != null and proType != "" and proType != "0"'> and projectType = #{proType}</if>
|
||||
<if test='proType != null and proType != "" and proType != "0"'> and proType = #{proType}</if>
|
||||
<if test="deptId >0 ">AND deptid = #{deptId}</if>
|
||||
<if test="prjIds !=null and prjIds.size()>0">
|
||||
and projectId in
|
||||
|
|
@ -698,7 +698,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<select id="countTimeout" parameterType="SmzSspProblemmodifyWhere" resultType="Integer">
|
||||
select count(1) cnt
|
||||
FROM smz_ssp_problemmodify ssp
|
||||
left join sur_project sp on p.projectId=sp.id
|
||||
left join sur_project sp on ssp.projectId=sp.id
|
||||
WHERE ssp.isDel=0 and sp.progressVisible=0 and sp.isDel=0
|
||||
<if test="infoType !=null">and ssp.infoType=#{infoType}</if>
|
||||
<if test="roleType !=null and roleType>0">and ssp.roleType=#{roleType}</if>
|
||||
|
|
|
|||
Loading…
Reference in New Issue