flx:暂存
This commit is contained in:
parent
4fb4d607d6
commit
fe105b7257
@ -346,17 +346,17 @@
|
|||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
<div v-show="recordType == 1 || (recordType == 1 && type == 'detail')">
|
<div v-show="recordType == 1 || (recordType == 1 && type == 'detail')">
|
||||||
<el-form ref="addForm1" size="small" :rules="addForm1Rules" :model="addForm1" label-width="120px">
|
<el-form ref="addForm1" size="small" :rules="addForm1Rules" :model="addForm1" label-width="120px">
|
||||||
<el-form-item label="合同模式" prop="subsectionId" :disabled="type == 'detail'">
|
<el-form-item label="合同模式" prop="contractModel" :disabled="type == 'detail'">
|
||||||
<el-select
|
<el-select
|
||||||
:disabled="type == 'detail'"
|
:disabled="type == 'detail'"
|
||||||
v-model="addForm1.subsectionId"
|
v-model="addForm1.contractModel"
|
||||||
@change="checkSubListData"
|
|
||||||
filterable
|
filterable
|
||||||
style="width: 400px"
|
style="width: 400px"
|
||||||
clearable
|
clearable
|
||||||
placeholder="请选择"
|
placeholder="请选择"
|
||||||
>
|
>
|
||||||
<el-option v-for="(item, index) in listData" :key="index" :label="item.subdivisionProjectName" :value="item.id"> </el-option>
|
<el-option v-for="(item, index) in contractModelList" :key="index" :label="item.contractModelName" :value="item.contractModelId">
|
||||||
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="下发层级" prop="subsectionId" :disabled="type == 'detail'">
|
<el-form-item label="下发层级" prop="subsectionId" :disabled="type == 'detail'">
|
||||||
@ -379,13 +379,12 @@
|
|||||||
:placeholder="$t('message.personnelPosition.please_select')"
|
:placeholder="$t('message.personnelPosition.please_select')"
|
||||||
filterable
|
filterable
|
||||||
>
|
>
|
||||||
<el-option :label="item.deviceUnitName" :value="item.deviceUnitId" v-for="(item, index) in deviceUnitList" :key="index">
|
<el-option :label="item.deviceUnitName" :value="item.id" v-for="(item, index) in deviceUnitList" :key="item.id"> </el-option>
|
||||||
</el-option>
|
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="项目组" prop="projectGroupId">
|
<el-form-item label="项目组" prop="projectGroupId">
|
||||||
<el-select
|
<el-select
|
||||||
@change="projectGroupFn(addForm1.projectGroupId)"
|
@change="projectGroupFn()"
|
||||||
v-model="addForm1.projectGroupId"
|
v-model="addForm1.projectGroupId"
|
||||||
:placeholder="$t('message.personnelPosition.please_select')"
|
:placeholder="$t('message.personnelPosition.please_select')"
|
||||||
filterable
|
filterable
|
||||||
@ -408,6 +407,27 @@
|
|||||||
<el-option :label="item.enterpriseName" :value="item.id" v-for="(item, index) in constructionUnitList" :key="index"> </el-option>
|
<el-option :label="item.enterpriseName" :value="item.id" v-for="(item, index) in constructionUnitList" :key="index"> </el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item
|
||||||
|
label="检查人"
|
||||||
|
prop="inspectManId"
|
||||||
|
>
|
||||||
|
<el-select
|
||||||
|
:disabled="type=='detail'"
|
||||||
|
v-model="addForm1.inspectManId"
|
||||||
|
filterable
|
||||||
|
style="width: 400px"
|
||||||
|
clearable
|
||||||
|
:placeholder="$t('message.quality.pleaseSelect')"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in crewList"
|
||||||
|
:key="item.userId"
|
||||||
|
:label="item.workerName"
|
||||||
|
:value="item.userId"
|
||||||
|
>
|
||||||
|
</el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<!-- 检查部位-->
|
<!-- 检查部位-->
|
||||||
<el-form-item :label="$t('message.quality.checkPoint')" prop="regionId">
|
<el-form-item :label="$t('message.quality.checkPoint')" prop="regionId">
|
||||||
<el-cascader
|
<el-cascader
|
||||||
@ -456,7 +476,7 @@
|
|||||||
:options="classifyList"
|
:options="classifyList"
|
||||||
></el-cascader>
|
></el-cascader>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item :label="$t('message.quality.moreInfo')" prop="dangerDesc">
|
<el-form-item label="安全隐患情况表述" prop="dangerDesc">
|
||||||
<el-input
|
<el-input
|
||||||
:disabled="type == 'detail'"
|
:disabled="type == 'detail'"
|
||||||
type="textarea"
|
type="textarea"
|
||||||
@ -536,7 +556,7 @@
|
|||||||
>
|
>
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
<el-form-item label="事件描述" prop="addedDescription">
|
<!-- <el-form-item label="事件描述" prop="addedDescription">
|
||||||
<el-input
|
<el-input
|
||||||
:disabled="type == 'detail'"
|
:disabled="type == 'detail'"
|
||||||
type="textarea"
|
type="textarea"
|
||||||
@ -545,9 +565,8 @@
|
|||||||
v-model="addForm1.addedDescription"
|
v-model="addForm1.addedDescription"
|
||||||
>
|
>
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item :label="$t('message.quality.problemLevel')" prop="level">
|
<!-- <el-form-item :label="$t('message.quality.problemLevel')" prop="level">
|
||||||
<!-- 问题等级-->
|
|
||||||
<el-radio-group v-model="addForm1.level" :disabled="type == 'detail'">
|
<el-radio-group v-model="addForm1.level" :disabled="type == 'detail'">
|
||||||
<el-radio :label="1">{{ $t('message.quality.stair') }}</el-radio>
|
<el-radio :label="1">{{ $t('message.quality.stair') }}</el-radio>
|
||||||
<el-radio :label="2">{{ $t('message.quality.second') }}</el-radio>
|
<el-radio :label="2">{{ $t('message.quality.second') }}</el-radio>
|
||||||
@ -561,7 +580,7 @@
|
|||||||
<el-radio label="2">{{ $t('message.quality.severity') }}</el-radio>
|
<el-radio label="2">{{ $t('message.quality.severity') }}</el-radio>
|
||||||
<el-radio label="3">{{ $t('message.quality.critical') }}</el-radio>
|
<el-radio label="3">{{ $t('message.quality.critical') }}</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<!-- 检查人-->
|
<!-- 检查人-->
|
||||||
<!-- <el-form-item
|
<!-- <el-form-item
|
||||||
:label="$t('message.quality.rummager')"
|
:label="$t('message.quality.rummager')"
|
||||||
@ -606,7 +625,7 @@
|
|||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
<el-form-item v-if="COMPANY != 'zjwj'" :label="$t('message.quality.subContractor')" prop="enterpriseName">
|
<!-- <el-form-item v-if="COMPANY != 'zjwj'" :label="$t('message.quality.subContractor')" prop="enterpriseName">
|
||||||
<el-input
|
<el-input
|
||||||
:disabled="type == 'detail'"
|
:disabled="type == 'detail'"
|
||||||
placeholder="请选择"
|
placeholder="请选择"
|
||||||
@ -622,7 +641,7 @@
|
|||||||
"
|
"
|
||||||
>
|
>
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item :label="$t('message.quality.rectificationLimit')" prop="changeLimitTime">
|
<el-form-item :label="$t('message.quality.rectificationLimit')" prop="changeLimitTime">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
:disabled="type == 'detail'"
|
:disabled="type == 'detail'"
|
||||||
@ -657,7 +676,7 @@
|
|||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item :label="$t('message.quality.reviewOfThePeople')" prop="reviewId">
|
<!-- <el-form-item :label="$t('message.quality.reviewOfThePeople')" prop="reviewId">
|
||||||
<el-select
|
<el-select
|
||||||
:disabled="type == 'detail'"
|
:disabled="type == 'detail'"
|
||||||
v-model="addForm1.reviewId"
|
v-model="addForm1.reviewId"
|
||||||
@ -667,7 +686,7 @@
|
|||||||
:placeholder="$t('message.quality.pleaseSelect')"
|
:placeholder="$t('message.quality.pleaseSelect')"
|
||||||
>
|
>
|
||||||
<el-option v-for="item in reviewList" :key="item.userId + ''" :label="item.realName" :value="item.userId + ''">
|
<el-option v-for="item in reviewList" :key="item.userId + ''" :label="item.realName" :value="item.userId + ''">
|
||||||
<!-- <span style="float: left">{{ item.workerName }}</span>
|
<span style="float: left">{{ item.workerName }}</span>
|
||||||
<span style="float: right; color: #8492a6; font-size: 13px"
|
<span style="float: right; color: #8492a6; font-size: 13px"
|
||||||
>{{ $t("message.quality.phoneNumber") }}:{{
|
>{{ $t("message.quality.phoneNumber") }}:{{
|
||||||
item.userTel
|
item.userTel
|
||||||
@ -676,11 +695,11 @@
|
|||||||
item.userTel.substring(7)
|
item.userTel.substring(7)
|
||||||
: ""
|
: ""
|
||||||
}}</span
|
}}</span
|
||||||
> -->
|
>
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item :label="$t('message.quality.checkOne')" prop="verifyManId">
|
<!-- <el-form-item :label="$t('message.quality.checkOne')" prop="verifyManId">
|
||||||
<el-select
|
<el-select
|
||||||
:disabled="true"
|
:disabled="true"
|
||||||
v-model="addForm1.verifyManId"
|
v-model="addForm1.verifyManId"
|
||||||
@ -690,19 +709,9 @@
|
|||||||
:placeholder="$t('message.quality.pleaseSelect')"
|
:placeholder="$t('message.quality.pleaseSelect')"
|
||||||
>
|
>
|
||||||
<el-option v-for="item in crewList" :key="item.userId + ''" :label="item.realName" :value="item.userId + ''">
|
<el-option v-for="item in crewList" :key="item.userId + ''" :label="item.realName" :value="item.userId + ''">
|
||||||
<!-- <span style="float: left">{{ item.workerName }}</span>
|
|
||||||
<span style="float: right; color: #8492a6; font-size: 13px"
|
|
||||||
>{{ $t("message.quality.phoneNumber") }}:{{
|
|
||||||
item.userTel
|
|
||||||
? item.userTel.substring(0, 3) +
|
|
||||||
"****" +
|
|
||||||
item.userTel.substring(7)
|
|
||||||
: ""
|
|
||||||
}}</span
|
|
||||||
> -->
|
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<!-- <el-form-item
|
<!-- <el-form-item
|
||||||
:label="$t('message.quality.notifier')"
|
:label="$t('message.quality.notifier')"
|
||||||
prop="notifyPerson"
|
prop="notifyPerson"
|
||||||
@ -725,7 +734,7 @@
|
|||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
<el-form-item :label="$t('message.quality.sceneChanges')" prop="status">
|
<!-- <el-form-item :label="$t('message.quality.sceneChanges')" prop="status">
|
||||||
<el-switch
|
<el-switch
|
||||||
:disabled="type == 'detail'"
|
:disabled="type == 'detail'"
|
||||||
v-model="addForm1.status"
|
v-model="addForm1.status"
|
||||||
@ -736,7 +745,7 @@
|
|||||||
:inactive-value="2"
|
:inactive-value="2"
|
||||||
>
|
>
|
||||||
</el-switch>
|
</el-switch>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<!-- 图纸定位 -->
|
<!-- 图纸定位 -->
|
||||||
<!-- <el-form-item
|
<!-- <el-form-item
|
||||||
v-if="COMPANY != 'longguang'"
|
v-if="COMPANY != 'longguang'"
|
||||||
@ -1782,6 +1791,7 @@ import {
|
|||||||
} from '@/assets/js/api/quality.js';
|
} from '@/assets/js/api/quality.js';
|
||||||
import { getProjectChilderSystemUserListApi, getEnterpriseInfoListApi, getLaborManagementInfoListApi } from '@/assets/js/api/configManage.js';
|
import { getProjectChilderSystemUserListApi, getEnterpriseInfoListApi, getLaborManagementInfoListApi } from '@/assets/js/api/configManage.js';
|
||||||
import { getDeviceUnitPage, getProjectGroupPage, getProjectGroupEnterpriseList } from '@/assets/js/api/project';
|
import { getDeviceUnitPage, getProjectGroupPage, getProjectGroupEnterpriseList } from '@/assets/js/api/project';
|
||||||
|
import { getCooperatorListApi } from '@/assets/js/api/cooperationUnit';
|
||||||
import { VueCropper } from 'vue-cropper';
|
import { VueCropper } from 'vue-cropper';
|
||||||
import {
|
import {
|
||||||
getSubdivisionProjectApi //所有分部分项工程, 以父子节点形式呈现
|
getSubdivisionProjectApi //所有分部分项工程, 以父子节点形式呈现
|
||||||
@ -1846,6 +1856,7 @@ export default {
|
|||||||
addDialog: false,
|
addDialog: false,
|
||||||
addTitle: this.$t('message.quality.new') + this.$t('message.quality.inspectionRecord'),
|
addTitle: this.$t('message.quality.new') + this.$t('message.quality.inspectionRecord'),
|
||||||
addForm1: {
|
addForm1: {
|
||||||
|
contractModel: '',
|
||||||
deviceUnitId: '',
|
deviceUnitId: '',
|
||||||
projectGroupId: '',
|
projectGroupId: '',
|
||||||
supervisingUnitId: '',
|
supervisingUnitId: '',
|
||||||
@ -1952,6 +1963,16 @@ export default {
|
|||||||
unitRegionId: '',
|
unitRegionId: '',
|
||||||
enterpriseList: [],
|
enterpriseList: [],
|
||||||
|
|
||||||
|
contractModelList: [
|
||||||
|
{
|
||||||
|
contractModelId: 1,
|
||||||
|
contractModelName: 'EPC'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
contractModelId: 2,
|
||||||
|
contractModelName: 'E+P+C'
|
||||||
|
}
|
||||||
|
], // 合同模式
|
||||||
deviceUnitList: [], // 装置列表
|
deviceUnitList: [], // 装置列表
|
||||||
enterpriseTypeList: [], // 项目组
|
enterpriseTypeList: [], // 项目组
|
||||||
cooperatorList: [], // 所有企业信息
|
cooperatorList: [], // 所有企业信息
|
||||||
@ -2023,10 +2044,16 @@ export default {
|
|||||||
}
|
}
|
||||||
return prev;
|
return prev;
|
||||||
}, []);
|
}, []);
|
||||||
console.log(1111, this.epcContractorList, this.constructionUnitList);
|
console.log(1111, this.cooperatorList, this.epcContractorList, this.constructionUnitList);
|
||||||
// if(type == 2) {
|
if (this.supervisingUnitList.length == 1) {
|
||||||
// this.epcContractorFn(2);
|
this.addForm1.supervisingUnitId = this.supervisingUnitList[0].id;
|
||||||
// }
|
}
|
||||||
|
if (this.epcContractorList.length == 1) {
|
||||||
|
this.addForm1.epcContractorId = this.epcContractorList[0].id;
|
||||||
|
}
|
||||||
|
if (this.constructionUnitList.length == 1) {
|
||||||
|
this.addForm1.constructionUnitId = this.constructionUnitList[0].id;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -2037,12 +2064,17 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
projectGroupListFn(projectGroupIds) {
|
projectGroupListFn(projectGroupIds) {
|
||||||
|
this.addForm1.projectGroupId = "";
|
||||||
getProjectGroupPage({
|
getProjectGroupPage({
|
||||||
projectSn: this.$store.state.projectSn,
|
projectSn: this.$store.state.projectSn,
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: -1
|
pageSize: -1
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
this.enterpriseTypeList = res.result.records.filter(item => (projectGroupIds ? projectGroupIds.includes(item.id) : true));
|
this.enterpriseTypeList = res.result.records.filter(item => (projectGroupIds ? projectGroupIds.includes(item.id) : true));
|
||||||
|
if (this.enterpriseTypeList.length == 1) {
|
||||||
|
this.addForm1.projectGroupId = this.enterpriseTypeList[0].id;
|
||||||
|
}
|
||||||
|
this.projectGroupFn();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//获取列表数据
|
//获取列表数据
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user