fix: BUG修改

This commit is contained in:
kun 2024-04-26 00:51:14 +08:00
parent 685531608a
commit 3a0bbb68b1
5 changed files with 5144 additions and 1626 deletions

View File

@ -119,6 +119,9 @@ export default {
inspectTime: [ inspectTime: [
{ required: true, message: "请选择检查时间", trigger: "change" }, { required: true, message: "请选择检查时间", trigger: "change" },
], ],
enterpriseName: [
{ required: true, message: "请选择分包单位", trigger: "change" },
],
changeLimitTime: [ changeLimitTime: [
{ required: true, message: "请选择整改时限", trigger: "change" }, { required: true, message: "请选择整改时限", trigger: "change" },
], ],

View File

@ -84,8 +84,8 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工) // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工)
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头

View File

@ -688,7 +688,7 @@
:placeholder="$t('message.quality.pleaseSelect')" :placeholder="$t('message.quality.pleaseSelect')"
> >
<el-option <el-option
v-for="item in crewList" v-for="item in crewUpdateList"
:key="item.userId + ''" :key="item.userId + ''"
:label="item.realName" :label="item.realName"
:value="item.userId + ''" :value="item.userId + ''"
@ -1214,7 +1214,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<div class="dialog_content"> <div class="dialog_content">
<el-radio-group <!-- <el-radio-group
v-model="subcontractType" v-model="subcontractType"
size="small" size="small"
style="margin-bottom: 20px" style="margin-bottom: 20px"
@ -1226,7 +1226,7 @@
<el-radio-button :label="6">{{ <el-radio-button :label="6">{{
$t('message.quality.lborSubcontractor') $t('message.quality.lborSubcontractor')
}}</el-radio-button> }}</el-radio-button>
</el-radio-group> </el-radio-group> -->
<el-table <el-table
:data="subcontractList" :data="subcontractList"
style="width: 100%" style="width: 100%"
@ -2070,6 +2070,7 @@ export default {
checkStrictly: false checkStrictly: false
}, },
crewList: [], crewList: [],
crewUpdateList: [],
routineList: [], // routineList: [], //
showEnterpriseDialog: false, // showEnterpriseDialog: false, //
subcontractType: 1, // subcontractType: 1, //
@ -2100,6 +2101,7 @@ export default {
player: '', player: '',
isShow: false, isShow: false,
videoName: '', videoName: '',
unitEnterpriseId: ''
} }
}, },
created() { created() {
@ -2560,7 +2562,9 @@ export default {
inspectStartTime: '', inspectStartTime: '',
recordType: '', recordType: '',
level: '', level: '',
status: '' status: '',
urgentLevel: '',
regionId: '',
} }
this.pageNo = 1 this.pageNo = 1
this.pageSize = 10 this.pageSize = 10
@ -2605,6 +2609,7 @@ export default {
this.getPositionList() this.getPositionList()
this.getDescribeClassifyList() this.getDescribeClassifyList()
this.getPeopleList() this.getPeopleList()
this.getPeopleUpdateList();
this.getRoutineInspect() this.getRoutineInspect()
this.close() this.close()
this.rectifyRecordList = [] this.rectifyRecordList = []
@ -2677,7 +2682,18 @@ export default {
} }
}) })
}, },
//
getPeopleUpdateList() {
let data = {
projectSn: this.projectSn,
enterpriseId: this.unitEnterpriseId
}
getProjectChilderSystemUserListApi(data).then((res) => {
if (res.code == 200) {
this.crewUpdateList = res.result
}
})
},
// //
handleChange(value) { handleChange(value) {
@ -2739,7 +2755,7 @@ export default {
this.showEnterpriseDialog = true this.showEnterpriseDialog = true
} }
let data = { let data = {
enterpriseTypeId: this.subcontractType, // enterpriseTypeId: this.subcontractType,
pageNo: 1, pageNo: 1,
pageSize: 999, pageSize: 999,
projectSn: this.projectSn projectSn: this.projectSn
@ -2761,10 +2777,15 @@ export default {
if (this.recordType == 1) { if (this.recordType == 1) {
this.addForm1.enterpriseSn = val.enterpriseSn this.addForm1.enterpriseSn = val.enterpriseSn
this.addForm1.enterpriseName = val.enterpriseName this.addForm1.enterpriseName = val.enterpriseName
this.unitEnterpriseId = val.id
} else { } else {
this.addForm2.enterpriseSn = val.enterpriseSn this.addForm2.enterpriseSn = val.enterpriseSn
this.addForm2.enterpriseName = val.enterpriseName this.addForm2.enterpriseName = val.enterpriseName
this.unitEnterpriseId = val.id
} }
this.addForm1.changeId = "";
this.getPeopleList();
this.getPeopleUpdateList();
this.showEnterpriseDialog = false this.showEnterpriseDialog = false
}, },

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff