|
|
@@ -51,6 +51,41 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="工程类型" prop="enginType">
|
|
|
+ <el-select v-model="queryParams1.enginType" placeholder="请选择工程类型" clearable
|
|
|
+ @change="enginTypeHasChangeds"
|
|
|
+ @clear="currentEnginTypeChangeOptions1=[];queryParams1.enginClassification=undefined;queryParams1.enginType=undefined">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in enginTypeOption"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="工程分类" prop="enginClassification">
|
|
|
+ <el-select v-model="queryParams1.enginClassification" placeholder="请选择工程分类" clearable
|
|
|
+ @clear="">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in currentEnginTypeChangeOptions1"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="工程周期" prop="enginCycle">
|
|
|
+ <el-select v-model="queryParams1.enginCycle" placeholder="请选择工程周期" clearable
|
|
|
+ @clear="">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.engin_cycle"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
<el-form-item>
|
|
|
<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>
|
|
|
@@ -410,7 +445,7 @@
|
|
|
title="批量审核"
|
|
|
:visible.sync="checkingsVisible"
|
|
|
class="checkingAll"
|
|
|
- >
|
|
|
+ >
|
|
|
<el-form :model="checkingForm">
|
|
|
<el-form-item label="工程类型" prop="enginType">
|
|
|
<el-select
|
|
|
@@ -464,27 +499,27 @@
|
|
|
<el-form-item
|
|
|
label-width="70px"
|
|
|
label="审核状态"
|
|
|
- >
|
|
|
+ >
|
|
|
<el-select v-model="checkingForm.reviewStatus" placeholder="请选择审核状态" label="审核状态">
|
|
|
- <el-option
|
|
|
+ <el-option
|
|
|
v-for="e in reviewStatusList"
|
|
|
:key="e.label"
|
|
|
:label="e.label"
|
|
|
:value="e.value"
|
|
|
- ></el-option>
|
|
|
+ ></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item
|
|
|
label-width="70px"
|
|
|
label="审核内容"
|
|
|
- >
|
|
|
+ >
|
|
|
<div class="block" style="display: inline-block; margin-right: 20px;">
|
|
|
- <el-input
|
|
|
- v-model="checkingForm.reviewContent"
|
|
|
- placeholder="请输入审核内容"
|
|
|
- type="textarea"
|
|
|
- style="width: 100%"/>
|
|
|
+ <el-input
|
|
|
+ v-model="checkingForm.reviewContent"
|
|
|
+ placeholder="请输入审核内容"
|
|
|
+ type="textarea"
|
|
|
+ style="width: 100%"/>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
@@ -529,19 +564,20 @@ import EngineePipe from '@/components/EngineePipe'
|
|
|
import ConstructionDetails from "@/components/ConstructionDetails/index.vue";
|
|
|
|
|
|
function formatDate(date) {
|
|
|
- const days = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
|
|
|
- const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
|
|
|
+ const days = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
|
|
|
+ const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
|
|
|
|
|
|
- const day = days[date.getUTCDay()];
|
|
|
- const month = months[date.getUTCMonth()];
|
|
|
- const dateNum = String(date.getUTCDate()).padStart(2, '0');
|
|
|
- const hours = String(date.getUTCHours()).padStart(2, '0');
|
|
|
- const minutes = String(date.getUTCMinutes()).padStart(2, '0');
|
|
|
- const seconds = String(date.getUTCSeconds()).padStart(2, '0');
|
|
|
- const year = date.getUTCFullYear();
|
|
|
+ const day = days[date.getUTCDay()];
|
|
|
+ const month = months[date.getUTCMonth()];
|
|
|
+ const dateNum = String(date.getUTCDate()).padStart(2, '0');
|
|
|
+ const hours = String(date.getUTCHours()).padStart(2, '0');
|
|
|
+ const minutes = String(date.getUTCMinutes()).padStart(2, '0');
|
|
|
+ const seconds = String(date.getUTCSeconds()).padStart(2, '0');
|
|
|
+ const year = date.getUTCFullYear();
|
|
|
+
|
|
|
+ return `${day} ${month} ${dateNum} ${hours}:${minutes}:${seconds} CST ${year}`;
|
|
|
+}
|
|
|
|
|
|
- return `${day} ${month} ${dateNum} ${hours}:${minutes}:${seconds} CST ${year}`;
|
|
|
- }
|
|
|
export default {
|
|
|
components: {
|
|
|
ConstructionDetails,
|
|
|
@@ -565,34 +601,34 @@ export default {
|
|
|
"engin_cycle"],
|
|
|
data() {
|
|
|
return {
|
|
|
- nodeDetailType:null,
|
|
|
+ nodeDetailType: null,
|
|
|
currentCollapses: [],
|
|
|
enginId: undefined,
|
|
|
- checkingsVisible:false,
|
|
|
+ checkingsVisible: false,
|
|
|
updateOption: [],
|
|
|
listContain: [
|
|
|
{
|
|
|
- name:'拆旧管',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'corrosionLevel', // 腐蚀等级
|
|
|
- ],
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- ]
|
|
|
+ name: '拆旧管',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'corrosionLevel', // 腐蚀等级
|
|
|
+ ],
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- name:'警器切断阀',
|
|
|
- components:[
|
|
|
- [
|
|
|
- 'materialQuality', // 材质
|
|
|
- 'specifications', // 规格
|
|
|
- 'number', // 数量
|
|
|
- ],
|
|
|
- 'constructTime', // 施工时间
|
|
|
- 'zEngiineeringPhotoBoList', // 照片
|
|
|
- 'remark', // 施工内容
|
|
|
- ]
|
|
|
+ name: '警器切断阀',
|
|
|
+ components: [
|
|
|
+ [
|
|
|
+ 'materialQuality', // 材质
|
|
|
+ 'specifications', // 规格
|
|
|
+ 'number', // 数量
|
|
|
+ ],
|
|
|
+ 'constructTime', // 施工时间
|
|
|
+ 'zEngiineeringPhotoBoList', // 照片
|
|
|
+ 'remark', // 施工内容
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
name: '放线',
|
|
|
@@ -788,6 +824,7 @@ export default {
|
|
|
},
|
|
|
],
|
|
|
currentEnginTypeChangeOptions: [],
|
|
|
+ currentEnginTypeChangeOptions1: [],
|
|
|
|
|
|
// 按钮loading
|
|
|
buttonLoading: false,
|
|
|
@@ -926,26 +963,26 @@ export default {
|
|
|
enginClassification_list: [], // 室内节点,
|
|
|
checkList: [],// 节点集合
|
|
|
enginNodeStatus: null,
|
|
|
- updateParams:{},
|
|
|
- status:null,
|
|
|
- createTime:'', // 工程创建时间
|
|
|
- checkingForm:{
|
|
|
- reviewStatus:'', // 审核状态
|
|
|
- reviewContent:'', // 审核内容
|
|
|
- enginType:null,
|
|
|
- enginClassification:null,
|
|
|
- reviewTime:'',
|
|
|
- type:'',
|
|
|
+ updateParams: {},
|
|
|
+ status: null,
|
|
|
+ createTime: '', // 工程创建时间
|
|
|
+ checkingForm: {
|
|
|
+ reviewStatus: '', // 审核状态
|
|
|
+ reviewContent: '', // 审核内容
|
|
|
+ enginType: null,
|
|
|
+ enginClassification: null,
|
|
|
+ reviewTime: '',
|
|
|
+ type: '',
|
|
|
},
|
|
|
- checkingAllList:[],
|
|
|
- reviewStatusList:[
|
|
|
+ checkingAllList: [],
|
|
|
+ reviewStatusList: [
|
|
|
{
|
|
|
- value:'1',
|
|
|
- label:'通过'
|
|
|
+ value: '1',
|
|
|
+ label: '通过'
|
|
|
},
|
|
|
{
|
|
|
- value:'0',
|
|
|
- label:'不通过'
|
|
|
+ value: '0',
|
|
|
+ label: '不通过'
|
|
|
}
|
|
|
],
|
|
|
};
|
|
|
@@ -961,36 +998,36 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- checkingAllSubmit(){
|
|
|
+ checkingAllSubmit() {
|
|
|
// this.checkingForm.createTime = formatDate(this.checkingForm.createTime)
|
|
|
engineeringCivilAllReview(this.checkingForm).then(res => {
|
|
|
- if(res.code == 200){
|
|
|
+ if (res.code == 200) {
|
|
|
this.$message({
|
|
|
message: '批量审核请求以提交后台，5-10分钟后均可成功。',
|
|
|
type: 'success'
|
|
|
});
|
|
|
this.checkingsVisible = false
|
|
|
this.checkingForm = {
|
|
|
- reviewStatus:'', // 审核状态
|
|
|
- reviewContent:'', // 审核内容
|
|
|
- enginType:null,
|
|
|
- enginClassification:null,
|
|
|
- reviewTime:'',
|
|
|
- type:'',
|
|
|
+ reviewStatus: '', // 审核状态
|
|
|
+ reviewContent: '', // 审核内容
|
|
|
+ enginType: null,
|
|
|
+ enginClassification: null,
|
|
|
+ reviewTime: '',
|
|
|
+ type: '',
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
// 批量审核
|
|
|
- handleCheckings(){
|
|
|
+ handleCheckings() {
|
|
|
this.checkingsVisible = true
|
|
|
},
|
|
|
// 节点单项审核
|
|
|
- checkWorking(checkingInfo){
|
|
|
+ checkWorking(checkingInfo) {
|
|
|
let params = checkingInfo
|
|
|
params.createTime = this.createTime
|
|
|
CivilReview(params).then(res => {
|
|
|
- if(res.code == 200){
|
|
|
+ if (res.code == 200) {
|
|
|
this.$message({
|
|
|
message: '审核成功',
|
|
|
type: 'success'
|
|
|
@@ -999,12 +1036,12 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
// 填写施工信息
|
|
|
- updateNodeOption(zEngineeringInfoBoList){
|
|
|
+ updateNodeOption(zEngineeringInfoBoList) {
|
|
|
delete this.updateParams.zEngineeringNodeBoList
|
|
|
this.updateParams.zEngineeringNodeBo.zEngineeringInfoBoList = zEngineeringInfoBoList
|
|
|
putEngineeringCivil(this.updateParams).then(res => {
|
|
|
console.log(res)
|
|
|
- if(res.code == 200){
|
|
|
+ if (res.code == 200) {
|
|
|
this.$message({
|
|
|
message: '修改成功',
|
|
|
type: 'success'
|
|
|
@@ -1015,7 +1052,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- addNodeInfo(e){
|
|
|
+ addNodeInfo(e) {
|
|
|
this.nodeDetailType = '修改'
|
|
|
this.enginId = e.id
|
|
|
this.status = 'put'
|
|
|
@@ -1036,7 +1073,7 @@ export default {
|
|
|
id: this.enginId,
|
|
|
type: e
|
|
|
}).then(res => {
|
|
|
- console.log('______',res)
|
|
|
+ console.log('______', res)
|
|
|
this.createTime = res.data.createTime
|
|
|
try {
|
|
|
this.updateParams = res.data
|
|
|
@@ -1044,12 +1081,12 @@ export default {
|
|
|
} catch (error) {
|
|
|
this.currentCollapses = [];
|
|
|
}
|
|
|
- console.log('折叠面板info',this.currentCollapses)
|
|
|
+ console.log('折叠面板info', this.currentCollapses)
|
|
|
})
|
|
|
this.$forceUpdate()
|
|
|
},
|
|
|
// 查看历史
|
|
|
- viewSource(e,type = null) {
|
|
|
+ viewSource(e, type = null) {
|
|
|
this.enginId = e.id
|
|
|
let val = e.enginType + "_" + e.enginClassification
|
|
|
getDicts(val).then(res => {
|
|
|
@@ -1060,7 +1097,7 @@ export default {
|
|
|
"value": res.data[i].dictValue,
|
|
|
})
|
|
|
}
|
|
|
- this.$refs.ConstructionDetails.open(dict,_,type)
|
|
|
+ this.$refs.ConstructionDetails.open(dict, _, type)
|
|
|
this.status = 'read-only'
|
|
|
})
|
|
|
},
|
|
|
@@ -1069,7 +1106,7 @@ export default {
|
|
|
this.$refs.enginPipe.openDialog({
|
|
|
id: data.id,
|
|
|
type: '民用工程'
|
|
|
- }, 'add',data)
|
|
|
+ }, 'add', data)
|
|
|
},
|
|
|
// 新增物料
|
|
|
addMaterial(data) {
|
|
|
@@ -1157,6 +1194,16 @@ export default {
|
|
|
this.houseOptions = res.data
|
|
|
})
|
|
|
},
|
|
|
+ enginTypeHasChangeds(enginType = null) {
|
|
|
+ if (this.queryParams1.enginType == undefined || this.queryParams1.enginType == null || this.queryParams1.enginType == '')
|
|
|
+ return
|
|
|
+ this.currentCheckList = []
|
|
|
+ this.queryParams1.enginClassification = ''
|
|
|
+ this.currentEnginTypeChangeOptions1 = []
|
|
|
+ getDicts(enginType || this.queryParams1.enginType).then(res => {
|
|
|
+ this.currentEnginTypeChangeOptions1 = res.data
|
|
|
+ })
|
|
|
+ },
|
|
|
enginTypeHasChanged(enginType = null) {
|
|
|
this.currentCheckList = []
|
|
|
this.queryParams.enginClassification = ''
|
|
|
@@ -1306,29 +1353,29 @@ export default {
|
|
|
// this.$emit('closeToSucceed')
|
|
|
}
|
|
|
})
|
|
|
- } else if(this.enginNodeStatus == '添加用料'){
|
|
|
+ } else if (this.enginNodeStatus == '添加用料') {
|
|
|
addEngineeringCivil(this.queryParams).then(res => {
|
|
|
- if(res.code == 200){
|
|
|
+ if (res.code == 200) {
|
|
|
this.$message({
|
|
|
message: '添加成功',
|
|
|
type: 'success'
|
|
|
});
|
|
|
this.open = false
|
|
|
- console.log('选中节点集合',this.currentCheckList)
|
|
|
+ console.log('选中节点集合', this.currentCheckList)
|
|
|
this.currentCheckList = []
|
|
|
this.getList()
|
|
|
// this.$emit('closeToSucceed')
|
|
|
}
|
|
|
})
|
|
|
- } else if(this.enginNodeStatus == '添加用料'){
|
|
|
+ } else if (this.enginNodeStatus == '添加用料') {
|
|
|
addEngineeringCivil(this.queryParams).then(res => {
|
|
|
- if(res.code == 200){
|
|
|
+ if (res.code == 200) {
|
|
|
this.$message({
|
|
|
message: '添加成功',
|
|
|
type: 'success'
|
|
|
});
|
|
|
this.open = false
|
|
|
- console.log('选中节点集合',this.currentCheckList)
|
|
|
+ console.log('选中节点集合', this.currentCheckList)
|
|
|
this.currentCheckList = []
|
|
|
// this.$emit('closeToSucceed')
|
|
|
}
|
|
|
@@ -1519,20 +1566,21 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-::v-deep .checkingAll{
|
|
|
- .el-dialog{
|
|
|
+::v-deep .checkingAll {
|
|
|
+ .el-dialog {
|
|
|
width: 40%;
|
|
|
height: 70%;
|
|
|
}
|
|
|
- .el-dialog__body{
|
|
|
+
|
|
|
+ .el-dialog__body {
|
|
|
padding-left: 28%;
|
|
|
}
|
|
|
|
|
|
- .el-form div:not(:nth-child(1)){
|
|
|
+ .el-form div:not(:nth-child(1)) {
|
|
|
margin-top: 1%;
|
|
|
}
|
|
|
|
|
|
- .el-textarea__inner{
|
|
|
+ .el-textarea__inner {
|
|
|
width: 360px;
|
|
|
height: 115px;
|
|
|
}
|
qinhouyu