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

fix: 冲突解决

Browse Source
This commit is contained in:
kun 2024-05-12 01:53:05 +08:00
commit 884967964a
6 changed files with 83 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pages/projectEnd/dangerBigProject/addConstructionStation.vue
View File

@ -8,16 +8,16 @@
<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
<view class="plan-form">
<view class="form-item b-bottom">
<view class="form-lable"><text class="tag">*</text>检查部位</view>
<input class="from-input" type="text" :value="formData.sideStationAddr" @blur="bindInputBlur" placeholder="请输入检查部位" />
<view class="form-lable"><text class="tag">*</text>施工部位</view>
<input class="from-input" type="text" :value="formData.sideStationAddr" @blur="bindInputBlur" placeholder="请输入施工部位" />
</view>
<view class="form-item f-column b-bottom">
<view class="form-lable">旁站记录</view>
<view class="form-lable"><text class="tag">*</text>旁站记录</view>
<textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.buildSituation" placeholder="请输入旁站记录" />
<view class="txt-length">{{textareaLengh}}/50</view>
</view>
<view class="form-item f-column">
<view class="form-lable">现场照片</view>
<view class="form-lable"><text class="tag">*</text>现场照片</view>
<view class="uni-form-input imgBox_wrap">
<view class="addImgBox" @click="uploadImg" v-show="formData.imgFileList.length == 0">
<image src="/static/safeMange/upload_image.png" class="icon-add" color="#F56C6C"></image>
@ -135,6 +135,30 @@
},
saveForm(){
console.log(this.formData)
if(!this.formData.sideStationAddr){
uni.showToast({
icon: 'none',
title: '请输入施工部位',
duration: 2000
})
return
}
if(!this.formData.buildSituation){
uni.showToast({
icon: 'none',
title: '请输入旁站记录',
duration: 2000
})
return
}
if(!this.formData.imgFileList.length > 0){
uni.showToast({
icon: 'none',
title: '请上传图片',
duration: 2000
})
return
}
let data = {
sideStationAddr: this.formData.sideStationAddr,
buildSituation: this.formData.buildSituation,

29
pages/projectEnd/dangerBigProject/addPlan.vue
View File

@ -12,12 +12,12 @@
<input class="from-input" :maxlength="22" type="text" :value="formData.dutyRegion" @blur="bindInputBlur" placeholder="请输入责任区域" />
</view>
<view class="form-item f-column b-bottom">
<view class="form-lable">进度描述</view>
<view class="form-lable"><text class="tag">*</text>进度描述</view>
<textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.progressDescribe" placeholder="请输入进度描述" />
<view class="txt-length">{{textareaLengh}}/50</view>
</view>
<view class="form-item f-column">
<view class="form-lable">现场照片</view>
<view class="form-lable"><text class="tag">*</text>现场照片</view>
<view class="uni-form-input imgBox_wrap">
<view class="addImgBox" @click="uploadImg" v-show="formData.imgFileList.length == 0">
<image src="/static/safeMange/upload_image.png" class="icon-add" color="#F56C6C"></image>
@ -150,9 +150,25 @@
arr.push(item.url)
})
data.imageUrl = arr.join(',')
if(data.dutyRegion == ""){
if(!data.dutyRegion){
uni.showToast({
title: '请输入责任区域！',
title: '请输入责任区域',
icon: "none",
duration: 2000
});
return;
}
if(!data.progressDescribe){
uni.showToast({
title: '请输入进度描述',
icon: "none",
duration: 2000
});
return;
}
if(!data.imageUrl){
uni.showToast({
title: '请上传图片',
icon: "none",
duration: 2000
});
@ -180,9 +196,13 @@
</script>
<style lang="scss" scoped>
.addPlan{
min-height: 100%;
background: #F6F6F6;
/deep/ .uni-input-wrapper{
font-size: 14px;
}
.fixedheader{
position: fixed;
top: 0;
@ -305,6 +325,7 @@
overflow: auto;
}
}
font-size: 14px;
}
}
}

3
pages/projectEnd/dangerBigProject/details.vue
View File

@ -66,7 +66,8 @@
<finally-acceptance ref="list" v-if="componentName =='finallyAcceptance'" :detailId="detailId" :info="detailData" ></finally-acceptance>
</view>
</view>
<view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3)
<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
<view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2
&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn"
@click="addForm">
<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>

27
pages/projectEnd/dangerBigProject/engineeringData.vue
View File

@ -10,11 +10,16 @@
:key="index"
@click="previewFile(item)">
<view class="img-box">
<image v-if="item.iconType == 'word'" src="../../../static/word.png"></image>
<!-- <image v-if="item.iconType == 'word'" src="../../../static/word.png"></image>
<image v-if="item.iconType == 'excel'" src="../../../static/excel.png"></image>
<image v-if="item.iconType == 'pdf'" src="../../../static/pdf.png"></image>
<image v-if="item.iconType == 'ppt'" src="../../../static/ppt.png"></image>
<image v-if="item.iconType == 'image'" src="../../../static/icon-image.png"></image>
<image v-if="item.iconType == 'image'" src="../../../static/icon-image.png"></image> -->
<image v-if="item.iconType.includes('word')" src="../../../static/word.png"></image>
<image v-if="item.iconType.includes('excel')" src="../../../static/excel.png"></image>
<image v-if="item.iconType.includes('pdf')" src="../../../static/pdf.png"></image>
<image v-if="item.iconType.includes('ppt')" src="../../../static/ppt.png"></image>
<image v-if="item.iconType.includes('image')" src="../../../static/icon-image.png"></image>
</view>
<view class="item-content">{{item.name}}</view>
<uni-icons type="arrowright"></uni-icons>
@ -29,11 +34,16 @@
:key="index"
@click="previewFile(item)">
<view class="img-box">
<image v-if="item.iconType == 'word'" src="../../../static/word.png"></image>
<!-- <image v-if="item.iconType == 'word'" src="../../../static/word.png"></image>
<image v-if="item.iconType == 'excel'" src="../../../static/excel.png"></image>
<image v-if="item.iconType == 'pdf'" src="../../../static/pdf.png"></image>
<image v-if="item.iconType == 'ppt'" src="../../../static/ppt.png"></image>
<image v-if="item.iconType == 'image'" src="../../../static/icon-image.png"></image>
<image v-if="item.iconType == 'image'" src="../../../static/icon-image.png"></image> -->
<image v-if="item.iconType.includes('word')" src="../../../static/word.png"></image>
<image v-if="item.iconType.includes('excel')" src="../../../static/excel.png"></image>
<image v-if="item.iconType.includes('pdf')" src="../../../static/pdf.png"></image>
<image v-if="item.iconType.includes('ppt')" src="../../../static/ppt.png"></image>
<image v-if="item.iconType.includes('image')" src="../../../static/icon-image.png"></image>
</view>
<view class="item-content">{{item.name}}</view>
<uni-icons type="arrowright"></uni-icons>
@ -48,11 +58,16 @@
:key="index"
@click="previewFile(item)">
<view class="img-box">
<image v-if="item.iconType == 'word'" src="../../../static/word.png"></image>
<!-- <image v-if="item.iconType == 'word'" src="../../../static/word.png"></image>
<image v-if="item.iconType == 'excel'" src="../../../static/excel.png"></image>
<image v-if="item.iconType == 'pdf'" src="../../../static/pdf.png"></image>
<image v-if="item.iconType == 'ppt'" src="../../../static/ppt.png"></image>
<image v-if="item.iconType == 'image'" src="../../../static/icon-image.png"></image>
<image v-if="item.iconType == 'image/png'" src="../../../static/icon-image.png"></image> -->
<image v-if="item.iconType.includes('word')" src="../../../static/word.png"></image>
<image v-if="item.iconType.includes('excel')" src="../../../static/excel.png"></image>
<image v-if="item.iconType.includes('pdf')" src="../../../static/pdf.png"></image>
<image v-if="item.iconType.includes('ppt')" src="../../../static/ppt.png"></image>
<image v-if="item.iconType.includes('image')" src="../../../static/icon-image.png"></image>
</view>
<view class="item-content">{{item.name}}</view>
<uni-icons type="arrowright"></uni-icons>

2
pages/projectEnd/dangerBigProject/finallyAcceptance.vue
View File

@ -6,7 +6,7 @@
<text style="font-weight: bold;">危大工程名称：</text>{{item.engineeringName}}
</view>
<view style="padding:10px;">
<text style="font-weight: bold;">计划时间：</text>{{item.planTime}}
<text style="font-weight: bold;">验收时间：</text>{{item.planTime}}
</view>
<view style="padding:10px;">
<text style="font-weight: bold;">验收人：</text>{{item.acceptanceUserName}}

7
pages/projectEnd/dangerBigProject/index.vue
View File

@ -14,7 +14,12 @@
<text class="tag" v-if="item.hiddenDangerNum > 0">未销项{{item.hiddenDangerNum}}</text>
{{item.engineeringName}}
</view>
<view :class="{'status1': item.engineeringState == 2,'status2': item.engineeringState == 3}">{{item.engineeringState == 2 ? "在施":item.engineeringState == 3 ? "已完工":""}}</view>
<!-- <view :class="{'status1': item.engineeringState == 2,'status2': item.engineeringState == 3}">
{{item.engineeringState == 2 ? "在施" : item.engineeringState == 3 ? "已完工" : ""}}
</view> -->
<view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
{{item.finalAcceptanceStatus == 1 ? "在施" : item.finalAcceptanceStatus == 2 ? "已完工" : ""}}
</view>
</view>
<view class="list-content">
<view class="list-info">