admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev

Browse Source
This commit is contained in:
kun 2024-05-16 13:43:37 +08:00
commit 9c859a7b45
11 changed files with 25 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pages/projectEnd/dangerBigProject/list/list.vue
View File

@ -367,12 +367,14 @@
chekItm8: '',
engineeringId: '',
workType: ''
}
},
onLoad(option) {
this.condition.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
this.engineeringId = option.engineeringId
this.workType = Number(option.type)
// console.log(JSON.parse(uni.getStorageSync('userInfo')))
this.getCheckPointList();
@ -503,6 +505,7 @@
this.condition.regionId = this.regionId
let that = this;
that.condition.type = that.workType
this.sendRequest({
url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post',
@ -561,6 +564,7 @@
this.condition.search = e.detail.value
let that = this;
// uni.showLoading({title: '加载中'})
that.condition.type = that.workType
this.sendRequest({
url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post',
@ -950,6 +954,7 @@
console.log('查询列表条件数据', this.checkedTab)
let that = this;
// uni.showLoading({title: '加载中'})
that.condition.type = that.workType
this.sendRequest({
url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post',

2
pages/projectEnd/specialOperations/fireWork/addSide.vue
View File

@ -164,7 +164,7 @@
buildSituation: this.formData.buildSituation,
dangerousEngineeringId: this.formData.dangerousEngineeringId,
createUser: JSON.parse(uni.getStorageSync('userInfo')).userId,
type:2
type: 2
}
let arr = []
this.formData.imgFileList.forEach(item=>{

2
pages/projectEnd/specialOperations/fireWork/addWorkFinally.vue
View File

@ -144,7 +144,7 @@
acceptanceUnitId: this.enterpriseId,
acceptanceUserId: this.acceptancePerson.userId,
planTime: this.planTime,
type:2
type: 2
}
console.log(data);
if(!data.acceptanceUnitId){

2
pages/projectEnd/specialOperations/fireWork/check.vue
View File

@ -246,7 +246,7 @@
acceptanceResult: this.formData.acceptanceResult, //验收结果
acceptanceDesc: this.formData.acceptanceDescribe, //验收描述
photo: this.formData.imgFileList[0].url,
type:2
type: 2
}
// data.createUser = JSON.parse(uni.getStorageSync('userInfo')).userId;
// let arr = []

2
pages/projectEnd/specialOperations/fireWork/checkList.vue
View File

@ -61,7 +61,7 @@
data:{
projectSn: this.projectSn,
acceptanceUserId: this.userInfo.userId,
type:2
type: 2
},
success:res=>{
uni.hideLoading()

2
pages/projectEnd/specialOperations/fireWork/detail.vue
View File

@ -222,7 +222,7 @@
data:{
engineeringId: this.detailData.id,
projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
type:2
type: 2
},
success:res=>{
uni.hideLoading()

5
pages/projectEnd/specialOperations/fireWork/plan.vue
View File

@ -52,7 +52,10 @@
this.sendRequest({
url:'xmgl/dangerousEngineeringProgressRecord/list',
method:'post',
data: {engineeringId: this.detailId,type: 2},
data: {
engineeringId: this.detailId,
type: 2,
},
success:res=>{
uni.hideLoading()
if(res.code==200){

6
pages/projectEnd/specialOperations/fireWork/safeList.vue
View File

@ -376,7 +376,7 @@
this.engineeringId = option.engineeringId
// console.log(JSON.parse(uni.getStorageSync('userInfo')))
this.getCheckPointList();
this.workType = option.type
this.workType = Number(option.type)
},
onShow() {
this.listData = [];
@ -504,6 +504,7 @@
this.condition.regionId = this.regionId
let that = this;
that.condition.type = that.workType
this.sendRequest({
url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post',
@ -562,6 +563,7 @@
this.condition.search = e.detail.value
let that = this;
// uni.showLoading({title: '加载中'})
that.condition.type = that.workType
this.sendRequest({
url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post',
@ -951,7 +953,7 @@
console.log('查询列表条件数据', this.checkedTab)
let that = this;
// uni.showLoading({title: '加载中'})
that.condition.type = Number(that.workType)
that.condition.type = that.workType
this.sendRequest({
url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post',

5
pages/projectEnd/specialOperations/fireWork/side.vue
View File

@ -52,7 +52,10 @@
this.sendRequest({
url:'xmgl/dangerousEngineeringSideStation/selectList',
method:'post',
data: {engineeringId: this.detailId,type:2},
data: {
engineeringId: this.detailId,
type:2,
},
success:res=>{
uni.hideLoading()
if(res.code==200){

34
pages/projectEnd/specialOperations/fireWork/work.vue
View File

@ -70,15 +70,13 @@
if(!this.isLoadMore){ //此处判断，上锁，防止重复请求
this.isLoadMore=true
this.pageNo+=1
// this.initData()
this.getWorkList()
this.getWorkList()
}
},
onPullDownRefresh() {
console.log(2)
this.pageNo=1
this.listData=[]
// this.initData()
this.getWorkList()
},
methods:{
@ -117,35 +115,7 @@
uni.navigateTo({
url:'./detail?id='+val.id
})
},
// initData(){
// let data = {
// pageNo: this.pageNo,
// pageSize: this.pageSize,
// projectSn: this.projectSn
// }
// this.sendRequest({
// url:'xmgl/dangerousEngineeringRecord/list',
// method:'post',
// data:data,
// success:res=>{
// uni.hideLoading()
// if(res.code==200){
// // this.listData = res.result.records
// this.listData=this.listData.concat(res.result.records)
// if(res.result.records.length<this.pageSize){ //判断接口返回数据量小于请求数据量，则表示此为最后一页
// this.isLoadMore=true
// this.loadStatus='nomore'
// }else{
// this.isLoadMore=false
// // that.loadStatus='more'
// }
// uni.stopPullDownRefresh()
// }
// console.log(res)
// }
// })
// },
}
}
}
</script>

2
pages/projectEnd/specialOperations/fireWork/workFinally.vue
View File

@ -51,7 +51,7 @@
data:{
engineeringId: this.detailId,
projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
type:2
type: 2
},
success:res=>{
uni.hideLoading()