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

Merge branch 'dev-yjl' into 'shenzhen-dev'

Browse Source 
质量管理-通知人回显类型bug修复

See merge request !140
This commit is contained in:
袁晶琳 2023-04-10 11:45:36 +08:00
commit 88076e9804
2 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/store/index.js
View File

@ -48,12 +48,12 @@ export default new Vuex.Store({
BASEURL: baseUrl
? baseUrl
: window.location.protocol + "//" + window.location.host + "/", //正式环境
UPLOADURL:
window.location.protocol +
"//" +
window.location.host +
"/upload/image", //正式环境
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// UPLOADURL:
// window.location.protocol +
// "//" +
// window.location.host +
// "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl
// ? baseUrl
@ -85,8 +85,8 @@ export default new Vuex.Store({
// UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
// FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式
// FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式
// UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台
// FILEURL: 'http://182.90.224.147:100/image/',//演示平台
UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台
FILEURL: 'http://182.90.224.147:100/image/',//演示平台
// UPLOADURL: 'http://116.169.63.183:7070/upload/image',//三江集团
// FILEURL: 'http://116.169.63.183:7070/image/',//三江集团

47
src/views/projectFront/quality/recordsModule/inspectionRecord.vue
View File

@ -417,7 +417,7 @@
>
</el-input>
</el-form-item>
<el-form-item label="分部工程" prop="subsectionId">
<!-- <el-form-item label="分部工程" prop="subsectionId">
<el-select
:disabled="type == 'detail'"
v-model="addForm1.subsectionId"
@ -465,7 +465,7 @@
v-model="addForm1.floor"
>
</el-input>
</el-form-item>
</el-form-item> -->
<el-form-item label="事件描述" prop="addedDescription">
<el-input
:disabled="type == 'detail'"
@ -584,7 +584,7 @@
>
</el-date-picker>
</el-form-item>
<el-form-item
<!-- <el-form-item
v-if="COMPANY != 'longguang'"
:label="$t('message.quality.drawingPositioning')"
>
@ -596,7 +596,7 @@
>{{ $t('message.quality.positionOnTheDrawing') }}</el-button
>
{{ $t('message.quality.selectDrawings') }}
</el-form-item>
</el-form-item> -->
<el-form-item
:label="$t('message.quality.subContractor')"
prop="enterpriseName"
@ -643,9 +643,9 @@
>
<el-option
v-for="item in crewList"
:key="item.userId"
:key="item.userId+''"
:label="item.workerName"
:value="item.userId"
:value="item.userId+''"
>
<!-- <span style="float: left">{{ item.workerName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px"
@ -674,9 +674,9 @@
>
<el-option
v-for="item in crewList"
:key="item.userId"
:key="item.userId+''"
:label="item.workerName"
:value="item.userId"
:value="item.userId+''"
>
<!-- <span style="float: left">{{ item.workerName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px"
@ -705,9 +705,9 @@
>
<el-option
v-for="item in crewList"
:key="item.userId"
:key="item.userId+''"
:label="item.workerName"
:value="item.userId"
:value="item.userId+''"
>
<!-- <span style="float: left">{{ item.workerName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px"
@ -736,9 +736,9 @@
>
<el-option
v-for="item in crewList"
:key="item.userId"
:key="item.userId+''"
:label="item.workerName"
:value="Number(item.userId)"
:value="item.userId+''"
>
<!-- <span style="float: left">{{ item.workerName }}</span>
<span
@ -1651,9 +1651,9 @@ export default {
text = pathLabels[i]
}
}
if (data.dutyId) {
this.addForm1.changeId = Number(data.dutyId)
}
// if (data.dutyId) {
// this.addForm1.changeId = Number(data.dutyId)
// }
this.addForm1.regionName = text
// console.log(data.intendanceIds.split(','))
// console.log(text)
@ -1662,9 +1662,9 @@ export default {
if (this.addForm1.notifyPerson > 0) {
this.addForm1.notifyPerson = []
}
this.addForm1.notifyPerson.push(
Number(data.intendanceIds.split(',')[j])
)
// this.addForm1.notifyPerson.push(
// Number(data.intendanceIds.split(',')[j])
// )
}
}
console.log(data.intendanceIds)
@ -1681,9 +1681,9 @@ export default {
text = pathLabels[i]
}
}
if (data.dutyId) {
this.addForm2.changeId = Number(data.dutyId)
}
// if (data.dutyId) {
// this.addForm2.changeId = Number(data.dutyId)
// }
this.addForm1.regionName = text
}
// this.addForm1.inspectManId = this.checkPointList
@ -1722,11 +1722,12 @@ export default {
},
//查看详情
showDatadetails(val) {
console.log(val)
console.log('查看详情====',val)
this.selectRectifyRecordList(val.id)
this.hideUpload = true
this.addBtn(1)
if (val.recordType == 1) {
console.log('类型是1吗');
this.recordType = 1
val.urgentLevel = Number(val.urgentLevel)
// val.notifyPerson = [Number(val.notifyPerson)];
@ -1755,7 +1756,7 @@ export default {
this.addForm1 = JSON.parse(JSON.stringify(val))
this.addForm1.notifyPerson = val.notifyPerson
.split(',')
.map((item) => Number(item))
.map((item2) => String(item2))
} else {
this.recordType = 2
val.urgentLevel = Number(val.urgentLevel)