admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flx：修改下拉

Browse Source
This commit is contained in:
X_Rian 2024-09-07 18:43:31 +08:00
parent 7714969fed
commit c9aeee5e4d
2 changed files with 69 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/views/projectFront/operationManage/liftingErectionWorks.vue
View File

@ -49,10 +49,12 @@
{{ scope.row.applicantName }} {{ scope.row.applicantName }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="作业装置" prop="operationEquipment" show-overflow-tooltip></el-table-column> <el-table-column align="center" label="作业装置" prop="operationEquipmentName"
show-overflow-tooltip></el-table-column>
<el-table-column align="center" label="作业地点" prop="operationLocation" <el-table-column align="center" label="作业地点" prop="operationLocation"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column align="center" label="作业内容" prop="operationContent" show-overflow-tooltip></el-table-column> <el-table-column align="center" label="作业内容" prop="operationContent"
show-overflow-tooltip></el-table-column>
<el-table-column align="center" label="级别" prop="level" show-overflow-tooltip> <el-table-column align="center" label="级别" prop="level" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.level ? workCategoryList[scope.row.level - 1].workCategoryName : {{ scope.row.level ? workCategoryList[scope.row.level - 1].workCategoryName :
@ -129,8 +131,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="作业装置" prop="operationEquipment"> <el-form-item label="作业装置" prop="operationEquipment">
<el-input v-model="cardForm.operationEquipment" <!-- <el-input v-model="cardForm.operationEquipment"
:placeholder="$t('message.personnelPosition.please_enter')"></el-input> :placeholder="$t('message.personnelPosition.please_enter')"></el-input> -->
<el-select v-model="cardForm.operationEquipment"
:placeholder="$t('message.personnelPosition.please_select')" filterable>
<el-option :label="item.deviceUnitName" :value="item.id"
v-for="(item, index) in deviceUnitList" :key="index">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="作业地点" prop="operationLocation"> <el-form-item label="作业地点" prop="operationLocation">
<el-input v-model="cardForm.operationLocation" <el-input v-model="cardForm.operationLocation"
@ -451,7 +459,7 @@
{{ workDetail.applicantName }} {{ workDetail.applicantName }}
</el-form-item> </el-form-item>
<el-form-item label="作业装置：" :label-width="formLabelWidthDetail"> <el-form-item label="作业装置：" :label-width="formLabelWidthDetail">
{{ workDetail.operationEquipment }} {{ workDetail.operationEquipmentName }}
<!-- <el-tooltip class="item" style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;" effect="dark" :content="workDetail.jobContent" <!-- <el-tooltip class="item" style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;" effect="dark" :content="workDetail.jobContent"
placement="top-start"> placement="top-start">
<div>{{ workDetail.jobContent }}</div> <div>{{ workDetail.jobContent }}</div>
@ -524,25 +532,25 @@
<template v-slot:gasanalysis> <template v-slot:gasanalysis>
<div class="gasanalysis-table1"> <div class="gasanalysis-table1">
<table> <table>
<thead> <thead>
<tr> <tr>
<th>序号</th> <th>序号</th>
<th>安全措施名称</th> <th>安全措施名称</th>
<th>安全措施确认</th> <th>安全措施确认</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="(ele, eIndex) in workDetail.tableList" :key="ele.id"> <tr v-for="(ele, eIndex) in workDetail.tableList" :key="ele.id">
<td>{{ eIndex + 1 }}</td> <td>{{ eIndex + 1 }}</td>
<td> <td>
{{ ele.titleName }} {{ ele.titleName }}
</td> </td>
<td> <td>
{{ ele.isAffirm ? ele.isAffirm : '--' }} {{ ele.isAffirm ? ele.isAffirm : '--' }}
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</template> </template>
<template v-slot:signature> <template v-slot:signature>
@ -664,6 +672,9 @@ import {
addLiftingOperationApi, addLiftingOperationApi,
editLiftingOperationApi, editLiftingOperationApi,
} from "@/assets/js/api/operationManage"; } from "@/assets/js/api/operationManage";
import {
getDeviceUnitList
} from "@/assets/js/api/project";
import { getWorkerInfoList } from '@/assets/js/api/laborPerson.js' import { getWorkerInfoList } from '@/assets/js/api/laborPerson.js'
import { getCooperatorListApi } from "@/assets/js/api/cooperationUnit"; import { getCooperatorListApi } from "@/assets/js/api/cooperationUnit";
export default { export default {
@ -835,6 +846,7 @@ export default {
}], }],
cooperatorList: [], // 所有企业信息 cooperatorList: [], // 所有企业信息
workerListOptions: [], // 工人列表 workerListOptions: [], // 工人列表
deviceUnitList: [], // 装置单位列表
}; };
}, },
created() { created() {
@ -845,6 +857,7 @@ export default {
this.getCooperatorList(); this.getCooperatorList();
this.getDutyPerson(); this.getDutyPerson();
this.getEnterpriseInfoList(); this.getEnterpriseInfoList();
this.loadAllPerson();
}, },
mounted() { }, mounted() { },
watch: { watch: {
@ -868,6 +881,16 @@ export default {
}, },
}, },
methods: { methods: {
//获取监理单位
loadAllPerson() {
// getEnterpriseTypeList
let param = {
projectSn: this.$store.state.projectSn,
};
getDeviceUnitList(param).then((res) => {
this.deviceUnitList = res.result;
});
},
isAddPoint(type, item) { isAddPoint(type, item) {
this.isAdd = type; this.isAdd = type;
this.cardDialog = true; this.cardDialog = true;
@ -891,7 +914,7 @@ export default {
}); });
return prev; return prev;
}, []), }, []),
tableList2: JSON.parse(item.operatorLicenseNumber).reduce((prev, item) => { tableList2: JSON.parse(item.operatorLicenseNumber).reduce((prev, item) => {
prev.push({ prev.push({
id: "id-" + Math.random().toString(36).substr(2, 9), id: "id-" + Math.random().toString(36).substr(2, 9),
specialOperationStaff: item["field6438549419062"] instanceof Array ? item["field6438549419062"][0] : item["field6438549419062"], specialOperationStaff: item["field6438549419062"] instanceof Array ? item["field6438549419062"][0] : item["field6438549419062"],

35
src/views/projectFront/quality/pouringOrderLedger.vue
View File

@ -8,8 +8,7 @@
</el-input> </el-input>
</el-form-item> --> </el-form-item> -->
<el-form-item label="混凝土编号"> <el-form-item label="混凝土编号">
<el-input placeholder="请输入" v-model="formInline.concreteNumber" clearable <el-input placeholder="请输入" v-model="formInline.concreteNumber" clearable style="width: 200px">
style="width: 200px">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="混泥土供应商"> <el-form-item label="混泥土供应商">
@ -51,9 +50,11 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="混凝土编号" prop="concreteNumber" <el-table-column align="center" label="混凝土编号" prop="concreteNumber"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column align="center" label="装置" prop="device" show-overflow-tooltip></el-table-column> <el-table-column align="center" label="装置" prop="deviceName" show-overflow-tooltip></el-table-column>
<el-table-column align="center" label="浇筑部位" prop="castingLocation" show-overflow-tooltip></el-table-column> <el-table-column align="center" label="浇筑部位" prop="castingLocation"
<el-table-column align="center" label="混凝土供应商" prop="concreteSupplierName" show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column align="center" label="混凝土供应商" prop="concreteSupplierName"
show-overflow-tooltip></el-table-column>
<el-table-column align="center" label="项目组" prop="projectGroupName"></el-table-column> <el-table-column align="center" label="项目组" prop="projectGroupName"></el-table-column>
<el-table-column align="center" label="EPC/PC承包商" prop="epcPcContractorName"></el-table-column> <el-table-column align="center" label="EPC/PC承包商" prop="epcPcContractorName"></el-table-column>
<el-table-column align="center" label="计划方量" prop="plannedVolume"></el-table-column> <el-table-column align="center" label="计划方量" prop="plannedVolume"></el-table-column>
@ -63,7 +64,7 @@
{{ scope.row.status == 1 ? '未浇筑' : scope.row.status == 2 ? '已浇筑' : '' }} {{ scope.row.status == 1 ? '未浇筑' : scope.row.status == 2 ? '已浇筑' : '' }}
</template> </template>
</el-table-column> </el-table-column>
<!-- 操作 --> <!-- 操作 -->
<el-table-column align="center" :label="$t('message.dangerousBigProject.operation')"> <el-table-column align="center" :label="$t('message.dangerousBigProject.operation')">
<template slot-scope="scope"> <template slot-scope="scope">
@ -121,8 +122,14 @@
:placeholder="$t('message.personnelPosition.please_enter')"></el-input> :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="装置" prop="device"> <el-form-item label="装置" prop="device">
<el-input v-model="cardForm.device" <!-- <el-input v-model="cardForm.device"
:placeholder="$t('message.personnelPosition.please_enter')"></el-input> :placeholder="$t('message.personnelPosition.please_enter')"></el-input> -->
<el-select v-model="cardForm.device"
:placeholder="$t('message.personnelPosition.please_select')" filterable>
<el-option :label="item.deviceUnitName" :value="item.id"
v-for="(item, index) in deviceUnitList" :key="index">
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="浇筑时间" prop="hotWorkExecutionTime"> <el-form-item label="浇筑时间" prop="hotWorkExecutionTime">
<el-date-picker v-model="cardForm.hotWorkExecutionTime" type="datetimerange" <el-date-picker v-model="cardForm.hotWorkExecutionTime" type="datetimerange"
@ -195,14 +202,14 @@
<el-form-item label="混凝土编号：" :label-width="formLabelWidthDetail"> <el-form-item label="混凝土编号：" :label-width="formLabelWidthDetail">
{{ workDetail.concreteNumber }} {{ workDetail.concreteNumber }}
</el-form-item> </el-form-item>
<el-form-item label="浇筑时间：" :label-width="formLabelWidthDetail"> <el-form-item label="浇筑时间：" :label-width="formLabelWidthDetail">
<el-date-picker v-model="workDetail.hotWorkExecutionTime" type="datetimerange" <el-date-picker v-model="workDetail.hotWorkExecutionTime" type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期"> start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="装置：" :label-width="formLabelWidthDetail"> <el-form-item label="装置：" :label-width="formLabelWidthDetail">
{{ workDetail.device }} {{ workDetail.deviceName }}
</el-form-item> </el-form-item>
<el-form-item label="项目组：" :label-width="formLabelWidthDetail"> <el-form-item label="项目组：" :label-width="formLabelWidthDetail">
{{ workDetail.projectGroupName }} {{ workDetail.projectGroupName }}
@ -226,7 +233,7 @@
<el-form-item label="浇筑状态：" :label-width="formLabelWidthDetail"> <el-form-item label="浇筑状态：" :label-width="formLabelWidthDetail">
{{ workDetail.status == 2 ? "已浇筑" : workDetail.status == 1 ? "未浇筑" : '' }} {{ workDetail.status == 2 ? "已浇筑" : workDetail.status == 1 ? "未浇筑" : '' }}
</el-form-item> </el-form-item>
<!-- <el-form-item label="现场作业环境：" :label-width="formLabelWidthDetail"> <!-- <el-form-item label="现场作业环境：" :label-width="formLabelWidthDetail">
<div class="img-show"> <div class="img-show">
<el-image v-for="(item, index) in workDetail.fieldWorkingEnvironment" :key="index" <el-image v-for="(item, index) in workDetail.fieldWorkingEnvironment" :key="index"
@ -709,9 +716,9 @@ export default {
getProjectGroupList(param).then((res) => { getProjectGroupList(param).then((res) => {
this.projectGroupTypeList = res.result; this.projectGroupTypeList = res.result;
}); });
// getDeviceUnitList(param).then((res) => { getDeviceUnitList(param).then((res) => {
// this.deviceUnitList = res.result; this.deviceUnitList = res.result;
// }); });
}, },
}, },