|
|
@@ -97,7 +97,6 @@
|
|
|
:value="dict.value"
|
|
|
/>
|
|
|
</el-select>
|
|
|
-
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="工程周期" prop="enginCycle">-->
|
|
|
<!-- <el-select v-model="queryParams1.enginCycle" placeholder="请选择工程周期" clearable-->
|
|
|
@@ -116,7 +115,6 @@
|
|
|
<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
|
|
|
@@ -129,54 +127,63 @@
|
|
|
>新增
|
|
|
</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="['zdsz:engineeringCivil:edit']"-->
|
|
|
+<!-- >修改工程信息-->
|
|
|
+<!-- </el-button>-->
|
|
|
+<!-- </el-col>-->
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
- type="success"
|
|
|
+ type="warning"
|
|
|
plain
|
|
|
- icon="el-icon-edit"
|
|
|
+ icon="el-icon-download"
|
|
|
size="mini"
|
|
|
- :disabled="single"
|
|
|
- @click="handleUpdate"
|
|
|
- v-hasPermi="['zdsz:engineeringCivil:edit']"
|
|
|
- >修改工程信息
|
|
|
+ @click="handleExport"
|
|
|
+ v-hasPermi="['zdsz:engineeringCivil:export']"
|
|
|
+ >导出
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="danger"
|
|
|
- plain
|
|
|
- icon="el-icon-delete"
|
|
|
+ icon="el-icon-circle-check"
|
|
|
size="mini"
|
|
|
- :disabled="multiple"
|
|
|
- @click="handleDelete"
|
|
|
- v-hasPermi="['zdsz:engineeringCivil:remove']"
|
|
|
- >删除
|
|
|
+ @click="handleCheckings"
|
|
|
+ v-hasPermi="['zdsz:engineeringCivil:review']"
|
|
|
+ >批量审核
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
- type="warning"
|
|
|
- plain
|
|
|
- icon="el-icon-download"
|
|
|
+ type="success"
|
|
|
+ icon="el-icon-circle-check"
|
|
|
size="mini"
|
|
|
- @click="handleExport"
|
|
|
- v-hasPermi="['zdsz:engineeringCivil:export']"
|
|
|
- >导出
|
|
|
+ @click="batchCheckings"
|
|
|
+ v-hasPermi="['zdsz:engineeringCivilNode:batch']"
|
|
|
+ >节点开关
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
+ <el-col :span="2.5" style="margin-left: 66%">
|
|
|
<el-button
|
|
|
type="danger"
|
|
|
- icon="el-icon-circle-check"
|
|
|
+ plain
|
|
|
+ icon="el-icon-delete"
|
|
|
size="mini"
|
|
|
- @click="handleCheckings"
|
|
|
- v-hasPermi="['zdsz:engineeringCivil:review']"
|
|
|
- >批量审核
|
|
|
+ :disabled="multiple"
|
|
|
+ @click="handleDelete"
|
|
|
+ v-hasPermi="['zdsz:engineeringCivil:remove']"
|
|
|
+ >删除
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
-
|
|
|
<el-table v-loading="loading" :data="engineeringCivilList" @selection-change="handleSelectionChange">
|
|
|
<el-table-column type="selection" width="55" align="center"/>
|
|
|
<el-table-column label="主键" align="center" prop="id" v-if="false"/>
|
|
|
@@ -209,7 +216,7 @@
|
|
|
placement="top-start"
|
|
|
trigger="hover"
|
|
|
:content="item.Type">
|
|
|
- <span slot="reference" v-if="item.state == '1'" style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F"></span>
|
|
|
+ <span slot="reference" v-if="item.state == '1'||item.state == '2'" style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F"></span>
|
|
|
<span slot="reference" v-if="item.state == '0'" style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639"></span>
|
|
|
</el-popover>
|
|
|
</div>
|
|
|
@@ -233,14 +240,14 @@
|
|
|
v-hasPermi="['zdsz:engineeringCivil:add']"
|
|
|
>修改施工信息
|
|
|
</el-button>
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-delete"
|
|
|
- @click="handleDelete(scope.row)"
|
|
|
- v-hasPermi="['zdsz:engineeringCivil:remove']"
|
|
|
- >删除
|
|
|
- </el-button>
|
|
|
+<!-- <el-button-->
|
|
|
+<!-- size="mini"-->
|
|
|
+<!-- type="text"-->
|
|
|
+<!-- icon="el-icon-delete"-->
|
|
|
+<!-- @click="handleDelete(scope.row)"-->
|
|
|
+<!-- v-hasPermi="['zdsz:engineeringCivil:remove']"-->
|
|
|
+<!-- >删除-->
|
|
|
+<!-- </el-button>-->
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
@@ -581,6 +588,163 @@
|
|
|
<el-button type="primary" @click=checkingAllSubmit>提 交</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ ref="checkingAllForm"
|
|
|
+ title="节点开关"
|
|
|
+ :visible.sync="batchVisible"
|
|
|
+
|
|
|
+ @close="checkingAllFormClosed"
|
|
|
+ >
|
|
|
+ <el-form :model="batchForm" :rules="batchFormRules" ref="batchFormAll" label-width="auto" label-position="right">
|
|
|
+ <el-row :gutter="24" style="text-align: center">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="行政区" prop="district">
|
|
|
+ <el-select v-model="batchForm.district" placeholder="请选择行政区" clearable
|
|
|
+ @change="batchForm.areaId = undefined;getAreaList(batchForm.district)"
|
|
|
+ @clear="batchForm.areaId = undefined;areaList=[];
|
|
|
+ batchForm.buildingId = undefined;buildingList=[];
|
|
|
+ batchForm.unitId = undefined;unitList=[]">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.district"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="小区名称" prop="areaId">
|
|
|
+ <el-select v-model="batchForm.areaId" filterable clearable placeholder="请选择小区"
|
|
|
+ @change="batchForm.buildingId = undefined;getBuildingList1(batchForm.areaId)"
|
|
|
+ @clear="batchForm.buildingId = undefined;buildingList=[];
|
|
|
+ batchForm.unitId = undefined;unitList=[]">
|
|
|
+ <el-option
|
|
|
+ v-for="item in areaList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="24" style="text-align: center">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="工程类型" prop="enginType">
|
|
|
+ <el-select
|
|
|
+ v-model="batchForm.enginType"
|
|
|
+ placeholder="请选择工程类型"
|
|
|
+ @change="enginTypeHasChanged"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="e in enginTypeOption"
|
|
|
+ :key="e.value"
|
|
|
+ :label="e.label"
|
|
|
+ :value="e.value"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="工程分类" prop="enginClassification">
|
|
|
+ <el-select
|
|
|
+ v-model="batchForm.enginClassification"
|
|
|
+ placeholder="请选择工程分类"
|
|
|
+ @change="currentCheckingAll"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="e in currentEnginTypeChangeOptions"
|
|
|
+ :key="e.dictValue"
|
|
|
+ :label="e.dictLabel"
|
|
|
+ :value="e.dictValue"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="24" style="text-align: center">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="环节" label-width="78px" prop="type">
|
|
|
+ <el-select
|
|
|
+ v-model="batchForm.type"
|
|
|
+ placeholder="请选择工程分类"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="e in checkingAllList"
|
|
|
+ :key="e.dictValue"
|
|
|
+ :label="e.dictLabel"
|
|
|
+ :value="e.dictValue"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+<!-- <el-form-item prop="reviewTime" label="工程创建时间" style="margin-left: -5%;">-->
|
|
|
+<!-- <el-date-picker-->
|
|
|
+<!-- v-model="batchForm.reviewTime"-->
|
|
|
+<!-- type="month"-->
|
|
|
+<!-- value-format="yyyy-MM"-->
|
|
|
+<!-- placeholder="选择月">-->
|
|
|
+<!-- </el-date-picker>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+ <el-form-item
|
|
|
+ label-width="78px"
|
|
|
+ label="节点开关"
|
|
|
+ prop="completionStatus"
|
|
|
+ >
|
|
|
+ <el-select v-model="batchForm.completionStatus" placeholder="请选择节点开关" label="审核状态"
|
|
|
+ @change="validateCHanged">
|
|
|
+ <el-option
|
|
|
+ v-for="e in swithList"
|
|
|
+ :key="e.label"
|
|
|
+ :label="e.label"
|
|
|
+ :value="e.value"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="24" style="text-align: center">
|
|
|
+<!-- <el-col :span="12">-->
|
|
|
+<!-- <el-form-item-->
|
|
|
+<!-- label-width="78px"-->
|
|
|
+<!-- label="审核状态"-->
|
|
|
+<!-- prop="reviewStatus"-->
|
|
|
+<!-- >-->
|
|
|
+<!-- <el-select v-model="batchForm.reviewStatus" placeholder="请选择审核状态" label="审核状态"-->
|
|
|
+<!-- @change="validateCHanged">-->
|
|
|
+<!-- <el-option-->
|
|
|
+<!-- v-for="e in reviewStatusList"-->
|
|
|
+<!-- :key="e.label"-->
|
|
|
+<!-- :label="e.label"-->
|
|
|
+<!-- :value="e.value"-->
|
|
|
+<!-- ></el-option>-->
|
|
|
+<!-- </el-select>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- </el-col>-->
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item
|
|
|
+ label-width="78px"
|
|
|
+ label="审核内容"
|
|
|
+ prop="reviewContent"
|
|
|
+ >
|
|
|
+ <div class="block" style="display: inline-block; margin-right: 20px;">
|
|
|
+ <el-input
|
|
|
+ v-model="batchForm.reviewContent"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ type="textarea"
|
|
|
+ style="width: 100%"/>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-form>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="batchVisible = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click=batchAllSubmit>提 交</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
<!-- 顶管工程新增 -->
|
|
|
<EngineePipe ref="enginPipe"/>
|
|
|
|
|
|
@@ -606,7 +770,7 @@ import {
|
|
|
viewEngineeringCivilSource,
|
|
|
|
|
|
engineeringCivilAllReview,
|
|
|
- CivilReview
|
|
|
+ CivilReview, batchNode
|
|
|
} from "@/api/zdsz/enginee"
|
|
|
import {getAreaList} from "@/api/zdsz/area";
|
|
|
import {getBuildingList} from "@/api/zdsz/building";
|
|
|
@@ -660,7 +824,40 @@ export default {
|
|
|
currentCollapses: [],
|
|
|
enginId: undefined,
|
|
|
checkingsVisible: false,
|
|
|
+ batchVisible:false,
|
|
|
updateOption: [],
|
|
|
+ batchFormRules:{
|
|
|
+ enginType: [
|
|
|
+ {required: true, message: "工程类型不能为空", trigger: ['change']}
|
|
|
+ ],
|
|
|
+ enginClassification: [
|
|
|
+ {required: true, message: "工程分类不能为空", trigger: ['change']}
|
|
|
+ ],
|
|
|
+ type: [
|
|
|
+ {required: true, message: "环节不能为空", trigger: ['change']}
|
|
|
+ ],
|
|
|
+ reviewTime: [
|
|
|
+ {required: true, message: "工程创建时间不能为空", trigger: ['change']}
|
|
|
+ ],
|
|
|
+ completionStatus: [
|
|
|
+ {required: true, message: "审核状态不能为空", trigger: ['change']}
|
|
|
+ ],
|
|
|
+ reviewContent: [
|
|
|
+ {required: true, message: "审核内容不能为空", trigger: ['change']}
|
|
|
+ ],
|
|
|
+ district: [
|
|
|
+ {required: true, message: "行政区不能为空", trigger: "change"}
|
|
|
+ ],
|
|
|
+ areaId: [
|
|
|
+ {required: true, message: "小区不能为空", trigger: "change"}
|
|
|
+ ],
|
|
|
+ buildingId: [
|
|
|
+ {required: true, message: "楼宇不能为空", trigger: "change"}
|
|
|
+ ],
|
|
|
+ unitId: [
|
|
|
+ {required: true, message: "单元不能为空", trigger: "change"}
|
|
|
+ ]
|
|
|
+ },
|
|
|
checkingFormRules: {
|
|
|
enginType: [
|
|
|
{required: true, message: "工程类型不能为空", trigger: ['change']}
|
|
|
@@ -679,7 +876,7 @@ export default {
|
|
|
],
|
|
|
reviewContent: [
|
|
|
{required: true, message: "审核内容不能为空", trigger: ['change']}
|
|
|
- ],
|
|
|
+ ]
|
|
|
},
|
|
|
listContain: [
|
|
|
{
|
|
|
@@ -1084,6 +1281,19 @@ export default {
|
|
|
reviewTime: '',
|
|
|
type: '',
|
|
|
},
|
|
|
+ batchForm:{
|
|
|
+ completionStatus: '', // 审核状态
|
|
|
+ reviewContent: '', // 审核内容
|
|
|
+ enginType: null,
|
|
|
+ enginClassification: null,
|
|
|
+ reviewTime: '',
|
|
|
+ type: '',
|
|
|
+ district:'',
|
|
|
+ buildingId:'',
|
|
|
+ unitId:'',
|
|
|
+ areaId:'',
|
|
|
+ enginCycle:0
|
|
|
+ },
|
|
|
checkingAllList: [],
|
|
|
reviewStatusList: [
|
|
|
{
|
|
|
@@ -1095,6 +1305,16 @@ export default {
|
|
|
label: '不通过'
|
|
|
}
|
|
|
],
|
|
|
+ swithList: [
|
|
|
+ {
|
|
|
+ value: '2',
|
|
|
+ label: '关闭'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '0',
|
|
|
+ label: '开启'
|
|
|
+ }
|
|
|
+ ],
|
|
|
zEngineeringNodeBo: {},
|
|
|
currentEnginName: null,
|
|
|
currentCheckingEnginList: []
|
|
|
@@ -1125,7 +1345,34 @@ export default {
|
|
|
validateCHanged(e) {
|
|
|
this.reviewStatusList[e].label == '通过' ? this.checkingFormRules.reviewContent[0].required = true : this.checkingFormRules.reviewContent[0].required = false
|
|
|
},
|
|
|
- checkingAllSubmit() {
|
|
|
+ batchAllSubmit(){
|
|
|
+ this.$refs.batchFormAll.validate(valid => {
|
|
|
+ if (valid) {
|
|
|
+ batchNode(this.batchForm).then(res=>{
|
|
|
+ if (res.code == 200) {
|
|
|
+ this.batchVisible = false
|
|
|
+ this.batchForm = {
|
|
|
+ completionStatus: '', // 审核状态
|
|
|
+ reviewContent: '', // 审核内容
|
|
|
+ enginType: null,
|
|
|
+ enginClassification: null,
|
|
|
+ reviewTime: '',
|
|
|
+ type: '',
|
|
|
+ district:'',
|
|
|
+ buildingId:'',
|
|
|
+ unitId:'',
|
|
|
+ areaId:'',
|
|
|
+ enginCycle:0
|
|
|
+ }
|
|
|
+ this.$refs.batchFormAll.resetFields()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ this.$message.error('请填写必填项!')
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ checkingAllSubmit() {
|
|
|
this.$refs.checkingFormAll.validate(valid => {
|
|
|
if (valid) {
|
|
|
// this.checkingForm.createTime = formatDate(this.checkingForm.createTime)
|
|
|
@@ -1156,6 +1403,9 @@ export default {
|
|
|
handleCheckings() {
|
|
|
this.checkingsVisible = true
|
|
|
},
|
|
|
+ batchCheckings() {
|
|
|
+ this.batchVisible = true
|
|
|
+ },
|
|
|
// 节点单项审核
|
|
|
checkWorking(checkingInfo) {
|
|
|
let params = checkingInfo
|
|
|
@@ -1333,6 +1583,17 @@ export default {
|
|
|
this.checkingAllList = res.data
|
|
|
})
|
|
|
},
|
|
|
+ currentCheckingAll() {
|
|
|
+ this.checkingAllList = []
|
|
|
+ if (this.batchForm.enginType == undefined || this.batchForm.enginType == ''
|
|
|
+ || this.batchForm.enginClassification == undefined || this.batchForm.enginClassification == ''
|
|
|
+ )
|
|
|
+ return
|
|
|
+ let val = this.batchForm.enginType + "_" + this.batchForm.enginClassification
|
|
|
+ getDicts(val).then(res => {
|
|
|
+ this.checkingAllList = res.data
|
|
|
+ })
|
|
|
+ },
|
|
|
// 当前所选行政区发生改变 查询当前小区集合
|
|
|
districtHasChanged(district) {
|
|
|
this.queryParams.areaId = null
|
wangtong