Ver código fonte

修改历史修改提交按钮显示问题

zhanghongrui 11 meses atrás
pai
commit
665a3e94b5

+ 1 - 1
pages/enginproject/enginproject.vue

@@ -541,7 +541,7 @@
 						}
 						this.open = true;
 						//请求
-						getengineeringNameListNew(this.projectType.dictValue).then(response => {
+						getengineeringNameListNew(this.projectType.dictValue,this.objValue.title).then(response => {
 
 							this.selectList = response.data;
 						});

+ 19 - 5
pages/statistics/historyDetailMunicipal.vue

@@ -249,11 +249,25 @@
 				this.type = e.type;
 				getHistoryMunicipalDetails(this.nodeId, this.type).then(response => {
 					if (response.data.zEngineeringNodeBo != null) {
-						this.hideButton = false;
-						this.dataJson = response.data;
-						this.title = response.data.zEngineeringNodeBo.type;
-						// this.enginType = response.data.enginType;
-						// this.enginClassification = response.data.enginClassification;
+						let flag = false;
+						for (let i in response.data.zEngineeringNodeBo.zEngineeringInfoBoList) {
+							if (response.data.zEngineeringNodeBo.zEngineeringInfoBoList[i].createBy == this.$user
+								.state.name) {
+								flag = true;
+								break;
+							}
+						}
+						if (flag) {
+
+							this.hideButton = false;
+							this.dataJson = response.data;
+							this.title = response.data.zEngineeringNodeBo.type;
+							// this.enginType = response.data.enginType;
+							// this.enginClassification = response.data.enginClassification;
+						} else {
+							this.hideButton = true;
+							this.$modal.msg("暂无本人历史信息")
+						}
 
 					} else {
 						this.hideButton = true;

+ 149 - 137
pages/statistics/historyDetails.vue

@@ -14,160 +14,160 @@
 								{{user.phone}}
 							</view>
 						</view>
+					</view>
+					<view class="uni-media-list-text-top" v-if="title=='拆旧管'">
+						<view class="tit-text">腐蚀等级:</view>
+						<view @click="pickerShow('fsdj',key)">
+							{{getSelectName(value.zEngineeringMaterialBo[0].corrosionLevel)}}
 						</view>
-						<view class="uni-media-list-text-top" v-if="title=='拆旧管'">
-							<view class="tit-text">腐蚀等级:</view>
-							<view @click="pickerShow('fsdj',key)">
-								{{getSelectName(value.zEngineeringMaterialBo[0].corrosionLevel)}}
-							</view>
-						</view>
-						<view class="uni-media-list-text-top" v-if="title=='打孔'">
-							<view class="tit-text">孔距:</view>
-							<view @click="pickerShow('kj',key)">
-								<!-- 123 -->
-								{{getSelectName(value.zEngineeringMaterialBo[0].corrosionLevel)}}
-							</view>
+					</view>
+					<view class="uni-media-list-text-top" v-if="title=='打孔'">
+						<view class="tit-text">孔距:</view>
+						<view @click="pickerShow('kj',key)">
+							<!-- 123 -->
+							{{getSelectName(value.zEngineeringMaterialBo[0].corrosionLevel)}}
 						</view>
-						<view class="uni-media-list-text-top" v-if="title=='挂表'">
-							<view class="tit-text">品牌:</view>
-							<view @click="pickerShow('brand',key)">
-								{{getSelectName(value.zEngineeringMaterialBo[0].brand)}}
-							</view>
+					</view>
+					<view class="uni-media-list-text-top" v-if="title=='挂表'">
+						<view class="tit-text">品牌:</view>
+						<view @click="pickerShow('brand',key)">
+							{{getSelectName(value.zEngineeringMaterialBo[0].brand)}}
 						</view>
-						<view class="uni-media-list-text-top" v-if="title=='切断阀'||title=='报警器'">
-							<view class="tit-text">厂家:</view>
-							<view @click="pickerShow('brand',key)">
-								{{getSelectName(value.zEngineeringMaterialBo[0].brand)}}
-							</view>
+					</view>
+					<view class="uni-media-list-text-top" v-if="title=='切断阀'||title=='报警器'">
+						<view class="tit-text">厂家:</view>
+						<view @click="pickerShow('brand',key)">
+							{{getSelectName(value.zEngineeringMaterialBo[0].brand)}}
 						</view>
-						<view class="" v-if="title=='立杠'||title=='表后管'">
-							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+					</view>
+					<view class="" v-if="title=='立杠'||title=='表后管'">
+						<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
 
-								<view class="tit-text">
-									材 质
-								</view>
+							<view class="tit-text">
+								材 质
+							</view>
 
-								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz',key)">
-									<span
-										style="color: black;">{{value.zEngineeringMaterialBo[0].materialQualityName}}</span>
+							<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz',key)">
+								<span
+									style="color: black;">{{value.zEngineeringMaterialBo[0].materialQualityName}}</span>
 
-								</view>
 							</view>
-							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+						</view>
+						<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
 
-								<view class="tit-text">
-									规 格
-								</view>
+							<view class="tit-text">
+								规 格
+							</view>
 
-								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg',key)">
-									<span
-										style="color: black;">{{value.zEngineeringMaterialBo[0].specificationsName==''?'请选择规格':value.zEngineeringMaterialBo[0].specificationsName}}</span>
+							<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg',key)">
+								<span
+									style="color: black;">{{value.zEngineeringMaterialBo[0].specificationsName==''?'请选择规格':value.zEngineeringMaterialBo[0].specificationsName}}</span>
 
-								</view>
 							</view>
-							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
-								<text class="tit-text">米 数</text>
-								<view style="display: flex; justify-content: right; width: 70%;">
-									<input class="uni-input" type="number"
-										:value="getIntegerPart(value.zEngineeringMaterialBo[0].number,0)"
-										@change="setInfoBoNumber(key,$event.target.value,0)" maxlength="6"
-										style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
-									<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
-
-									<input class="uni-input" type="number"
-										:value="getIntegerPart(value.zEngineeringMaterialBo[0].number,1)"
-										@change="setInfoBoNumber(key,$event.target.value,1)" maxlength="1"
-										style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
-								</view>
+						</view>
+						<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+							<text class="tit-text">米 数</text>
+							<view style="display: flex; justify-content: right; width: 70%;">
+								<input class="uni-input" type="number"
+									:value="getIntegerPart(value.zEngineeringMaterialBo[0].number,0)"
+									@change="setInfoBoNumber(key,$event.target.value,0)" maxlength="6"
+									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+								<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
+
+								<input class="uni-input" type="number"
+									:value="getIntegerPart(value.zEngineeringMaterialBo[0].number,1)"
+									@change="setInfoBoNumber(key,$event.target.value,1)" maxlength="1"
+									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 							</view>
 						</view>
+					</view>
 
-						<view class="uni-list" style="margin-bottom: 20px;" v-if="title=='阀管'">
+					<view class="uni-list" style="margin-bottom: 20px;" v-if="title=='阀管'">
 
-							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+						<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
 
-								<view>
-									上门类型
-								</view>
+							<view>
+								上门类型
+							</view>
 
-								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('door',key)">
-									<span style="color: black;">{{value.zEngineeringMaterialBo[0].visitType}}</span>
+							<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('door',key)">
+								<span style="color: black;">{{value.zEngineeringMaterialBo[0].visitType}}</span>
 
-								</view>
 							</view>
-							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+						</view>
+						<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
 
-								<view>
-									自闭阀厂家
-								</view>
+							<view>
+								自闭阀厂家
+							</view>
 
-								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('zbf',key)">
-									<span
-										style="color: black;">{{getSelectZBFName(value.zEngineeringMaterialBo[0].selfClosingValveType)}}</span>
+							<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('zbf',key)">
+								<span
+									style="color: black;">{{getSelectZBFName(value.zEngineeringMaterialBo[0].selfClosingValveType)}}</span>
 
-								</view>
 							</view>
-							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+						</view>
+						<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
 
-								<view>
-									灶具管厂家
-								</view>
+							<view>
+								灶具管厂家
+							</view>
 
-								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz',key)">
-									<span
-										style="color: black;">{{value.zEngineeringMaterialBo[0].materialQualityName}}</span>
+							<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz',key)">
+								<span
+									style="color: black;">{{value.zEngineeringMaterialBo[0].materialQualityName}}</span>
 
-								</view>
 							</view>
-							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+						</view>
+						<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
 
-								<view>
-									规 格
-								</view>
+							<view>
+								规 格
+							</view>
 
-								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg',key)">
-									<span
-										style="color: black;">{{value.zEngineeringMaterialBo[0].specificationsName==''?'请选择规格':value.zEngineeringMaterialBo[0].specificationsName}}</span>
+							<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg',key)">
+								<span
+									style="color: black;">{{value.zEngineeringMaterialBo[0].specificationsName==''?'请选择规格':value.zEngineeringMaterialBo[0].specificationsName}}</span>
 
-								</view>
 							</view>
 						</view>
+					</view>
 
-						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
-							<image :src="loadImgSrc('updateimg.png')" mode=""
-								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose(key)">
-							</image>
-							<view v-for="(item,index) in  value.zEngiineeringPhotoBoList" :key="index"
-								style="position: relative;">
-								<view
-									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
-									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-										@click="showPhoto(index,value.zEngiineeringPhotoBoList)">
-									</image>
-								</view>
-								<view v-else>
-									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-								</view>
-								<view @click="remove(index,key)"
-									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
-									</image>
-								</view>
+					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+						<image :src="loadImgSrc('updateimg.png')" mode=""
+							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose(key)">
+						</image>
+						<view v-for="(item,index) in  value.zEngiineeringPhotoBoList" :key="index"
+							style="position: relative;">
+							<view
+								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+									@click="showPhoto(index,value.zEngiineeringPhotoBoList)">
+								</image>
+							</view>
+							<view v-else>
+								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+							</view>
+							<view @click="remove(index,key)"
+								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+								</image>
 							</view>
 						</view>
-						<!-- </view> -->
 					</view>
+					<!-- </view> -->
 				</view>
 			</view>
-			<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
-				subtitleKey="id">
-			</SelectPicker>
-			<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
-				titleKey="dictLabel" subtitleKey="dictValue" v-model="name"></SelectPicker>
-			<view class="action-btn" v-if="hideButton==false">
-				<button @click="submit" class="btn cu-btn block bg-blue lg round">确认</button>
-			</view>
 		</view>
+		<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
+			subtitleKey="id">
+		</SelectPicker>
+		<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
+			titleKey="dictLabel" subtitleKey="dictValue" v-model="name"></SelectPicker>
+		<view class="action-btn" v-if="hideButton==false">
+			<button @click="submit" class="btn cu-btn block bg-blue lg round">确认</button>
+		</view>
+	</view>
 </template>
 
 <script>
@@ -237,30 +237,42 @@
 					}),
 					getHistoryDetails(this.nodeId, this.type).then(response => {
 						if (response.data.zEngineeringNodeBo != null) {
-							this.hideButton = false;
-							// if (response.data.zEngineeringNodeBo.createBy == this.$user.state.name) {
-							// 	this.hideButton = false;
-							// } else {
-							// 	this.hideButton = true;
-							// }
-
-							this.dataJson = response.data;
-							this.title = response.data.zEngineeringNodeBo.type;
-							console.log("===", this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList);
-							this.enginType = response.data.enginType;
-							this.enginClassification = response.data.enginClassification;
-							if (this.type == '阀管') {
-								getEnginMaterialQualityList("民用工程", this.enginType, this.enginClassification, this
-										.title,
-										'自闭阀厂家')
-									.then(
-										response => {
-											this.selectZbfList = response.data;
-											this.selectList = this.selectZbfList;
-										});
-							} else {
+							let flag = false;
+							for (let i in response.data.zEngineeringNodeBo.zEngineeringInfoBoList) {
+								if (response.data.zEngineeringNodeBo.zEngineeringInfoBoList[i].createBy == this.$user
+									.state.name) {
+									flag = true;
+									break;
+								}
+							}
+							if (flag) {
+								this.hideButton = false;
+								// if (response.data.zEngineeringNodeBo.createBy == this.$user.state.name) {
+								// 	this.hideButton = false;
+								// } else {
+								// 	this.hideButton = true;
+								// }
+
+								this.dataJson = response.data;
+								this.title = response.data.zEngineeringNodeBo.type;
+								this.enginType = response.data.enginType;
+								this.enginClassification = response.data.enginClassification;
+								if (this.type == '阀管') {
+									getEnginMaterialQualityList("民用工程", this.enginType, this.enginClassification, this
+											.title,
+											'自闭阀厂家')
+										.then(
+											response => {
+												this.selectZbfList = response.data;
+												this.selectList = this.selectZbfList;
+											});
+								} else {
 
-								this.getFSDJLevel();
+									this.getFSDJLevel();
+								}
+							} else {
+								this.hideButton = true;
+								this.$modal.msg("暂无本人历史信息")
 							}
 						} else {
 							this.hideButton = true;

+ 29 - 16
pages/statistics/historyDetailsCourtyard.vue

@@ -1,25 +1,25 @@
 <template>
 	<scroll-view>
-		<view class="uni-media-list" v-for="(value, key) in dataJson.zEngineeringNodeBo.zEngineeringInfoBoList" :key="key"
-					v-if="isEdit(value)">
+		<view class="uni-media-list" v-for="(value, key) in dataJson.zEngineeringNodeBo.zEngineeringInfoBoList"
+			:key="key" v-if="isEdit(value)">
 
 			<view class="uni-media-list-body">
-				<view >
+				<view>
 					<view class="uni-media-list-text-top">
 						<view class="tit-text">施工时间:</view>{{value.updateTime}}
 					</view>
 					<view class="uni-media-list-text-top">
-					<view class="uni-common-mt" style="width: 100%;">
-						<text class="tit-text" style=" font-size: 13px;color:
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="tit-text" style=" font-size: 13px;color:
 									#000;margin-top: 5px;">施工内容:</text>
-						<view style="width: 100%;box-sizing: border-box;">
-							<textarea class="textarea" maxlength="255" placeholder-style="padding: 10rpx;"
-								style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
-								auto-height :value="value.remark"
-								@blur="bindTextAreaBlur($event.target.value,key)"></textarea>
+							<view style="width: 100%;box-sizing: border-box;">
+								<textarea class="textarea" maxlength="255" placeholder-style="padding: 10rpx;"
+									style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
+									auto-height :value="value.remark"
+									@blur="bindTextAreaBlur($event.target.value,key)"></textarea>
+							</view>
 						</view>
 					</view>
-					</view>
 					<view
 						v-if="title=='开挖前'||title=='开挖后'||title=='焊口照片'||title=='隐蔽工程'||title=='除锈刷油'||title=='打磨'||title=='全貌照片'">
 						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
@@ -398,11 +398,24 @@
 				this.type = e.type;
 				getHistoryDetails(this.nodeId, this.type).then(response => {
 					if (response.data.zEngineeringNodeBo != null) {
-						this.hideButton = false;
-						this.dataJson = response.data;
-						this.title = response.data.zEngineeringNodeBo.type;
-						this.enginType = response.data.enginType;
-						this.enginClassification = response.data.enginClassification;
+						let flag = false;
+						for (let i in response.data.zEngineeringNodeBo.zEngineeringInfoBoList) {
+							if (response.data.zEngineeringNodeBo.zEngineeringInfoBoList[i].createBy == this.$user
+								.state.name) {
+								flag = true;
+								break;
+							}
+						}
+						if (flag) {
+							this.hideButton = false;
+							this.dataJson = response.data;
+							this.title = response.data.zEngineeringNodeBo.type;
+							this.enginType = response.data.enginType;
+							this.enginClassification = response.data.enginClassification;
+						} else {
+							this.hideButton = true;
+							this.$modal.msg("暂无本人历史信息")
+						}
 
 					} else {
 						this.hideButton = true;

+ 18 - 6
pages/statistics/historyDetailsEnginproject.vue

@@ -248,12 +248,24 @@
 				this.type = e.type;
 				getEngineeringHistoryListNew(this.nodeId, this.type).then(response => {
 					if (response.data.zEngineeringNodeBo != null) {
-						this.hideButton = false;
-						this.dataJson = response.data;
-						this.title = response.data.zEngineeringNodeBo.type;
-						this.enginType = response.data.enginType;
-						this.enginClassification = response.data.enginClassification;
-
+						let flag = false;
+						for (let i in response.data.zEngineeringNodeBo.zEngineeringInfoBoList) {
+							if (response.data.zEngineeringNodeBo.zEngineeringInfoBoList[i].createBy == this.$user
+								.state.name) {
+								flag = true;
+								break;
+							}
+						}
+						if (flag) {
+							this.hideButton = false;
+							this.dataJson = response.data;
+							this.title = response.data.zEngineeringNodeBo.type;
+							this.enginType = response.data.enginType;
+							this.enginClassification = response.data.enginClassification;
+						} else {
+							this.hideButton = true;
+							this.$modal.msg("暂无本人历史信息")
+						}
 					} else {
 						this.hideButton = true;
 						this.$modal.msg("暂无历史信息")

+ 45 - 25
pages/statistics/historyDetailsInfrastructure.vue

@@ -163,33 +163,49 @@
 				this.type = e.type;
 				getHistoryInfrastructureDetails(this.nodeId, this.type).then(response => {
 					if (response.data.zEngineeringNodeBo != null) {
-						this.hideButton = false;
+						let flag = false;
+						for (let i in response.data.zEngineeringNodeBo.zEngineeringInfoBoList) {
+							if (response.data.zEngineeringNodeBo.zEngineeringInfoBoList[i].createBy == this.$user
+								.state.name) {
+								flag = true;
+								break;
+							}
+						}
+						if (flag) {
+							this.hideButton = false;
 
 
-						this.dataJson = response.data;
-						this.title = response.data.zEngineeringNodeBo.type;
-						this.enginType = response.data.enginType;
-						this.enginClassification = response.data.enginClassification;
+							this.dataJson = response.data;
+							this.title = response.data.zEngineeringNodeBo.type;
+							this.enginType = response.data.enginType;
+							this.enginClassification = response.data.enginClassification;
 
-						this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((val, index) => {
-							if (val.createBy == this.$user.state.name) {
+							this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((val, index) => {
+								if (val.createBy == this.$user.state.name) {
 
 
-								this.selectList.forEach((item, index2) => {
-									if (val.zEngineeringMaterialBo[0].materialQuality == item.id) {
-										this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[
-												index]
-											.zEngineeringMaterialBo[0].isNew = false
+									this.selectList.forEach((item, index2) => {
+										if (val.zEngineeringMaterialBo[0].materialQuality == item
+											.id) {
+											this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[
+													index]
+												.zEngineeringMaterialBo[0].isNew = false
 
-									} else {
-										this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[
-												index]
-											.zEngineeringMaterialBo[0].isNew = true
-									}
-								})
+										} else {
+											this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[
+													index]
+												.zEngineeringMaterialBo[0].isNew = true
+										}
+									})
 
-							}
-						})
+								}
+							})
+						} else {
+							this.hideButton = true;
+							this.$modal.msg("暂无本人历史信息")
+						}
 					} else {
 						this.hideButton = true;
 						this.$modal.msg("暂无历史信息")
@@ -370,11 +386,15 @@
 
 			setInfoBo(key, str, type) {
 				if (type == 'cz') {
-					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].zEngineeringMaterialBo[0].materialQuality = str;
-					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].zEngineeringMaterialBo[0].materialQualityName = str;
-				}else{
-					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].zEngineeringMaterialBo[0].specifications = str;
-					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].zEngineeringMaterialBo[0].specificationsName = str;
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].zEngineeringMaterialBo[0]
+						.materialQuality = str;
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].zEngineeringMaterialBo[0]
+						.materialQualityName = str;
+				} else {
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].zEngineeringMaterialBo[0].specifications =
+						str;
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].zEngineeringMaterialBo[0]
+						.specificationsName = str;
 				}
 
 			},

+ 21 - 7
pages/statistics/historyDetailsTopTube.vue

@@ -152,13 +152,27 @@
 				this.type = e.type;
 				getHistoryTopTubeDetails(this.nodeId, this.type).then(response => {
 					if (response.data.zEngineeringNodeBo != null) {
-						this.hideButton = false;
+						let flag = false;
+						for (let i in response.data.zEngineeringNodeBo.zEngineeringInfoBoList) {
+							if (response.data.zEngineeringNodeBo.zEngineeringInfoBoList[i].createBy == this.$user
+								.state.name) {
+								flag = true;
+								break;
+							}
+						}
+						if (flag) {
+							this.hideButton = false;
 
 
-						this.dataJson = response.data;
-						this.title = response.data.zEngineeringNodeBo.type;
-						this.enginType = response.data.enginType;
-						this.enginClassification = response.data.enginClassification;
+							this.dataJson = response.data;
+							this.title = response.data.zEngineeringNodeBo.type;
+							this.enginType = response.data.enginType;
+							this.enginClassification = response.data.enginClassification;
+						} else {
+							this.hideButton = true;
+							this.$modal.msg("暂无本人历史信息")
+						}
+
 
 					} else {
 						this.hideButton = true;
@@ -319,7 +333,7 @@
 				// 	current: index,
 				// 	urls: arr,
 				// })
-				
+
 				let newArr = [];
 				arr.forEach((item, index) => {
 					if (item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ||
@@ -327,7 +341,7 @@
 						newArr.push(item)
 					}
 				});
-				
+
 				uni.previewImage({
 					current: index,
 					urls: newArr,

+ 53 - 28
pages/statistics/history_details_bottom_leg.vue

@@ -75,17 +75,21 @@
 							<text class="tit-text">开挖前照片:</text>
 							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; ">
 								<image :src="loadImgSrc('updateimg.png')" mode=""
-									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage(1,key)">
+									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; "
+									@click="chooseimage(1,key)">
 								</image>
-								<view v-for="(item,index) in  value.beforeBottom" :key="index" style="position: relative;">
+								<view v-for="(item,index) in  value.beforeBottom" :key="index"
+									style="position: relative;">
 									<view
 										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
-										<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+										<image :src="item" mode=""
+											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
 											@click="showPhoto(index,value.beforeBottom)">
 										</image>
 									</view>
 									<view v-else>
-										<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										<video :src="item"
+											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
 									</view>
 									<view @click="removeht(index,key,1)"
 										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
@@ -96,25 +100,29 @@
 							</view>
 						</view>
 					</view>
-					
-				
-<view class="uni-media-list-text-top">
-					<view class="uni-common-mt" style="width: 100%;">
-						<text class="tit-text" style=" font-size: 13px;color:
+
+
+					<view class="uni-media-list-text-top">
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="tit-text" style=" font-size: 13px;color:
 							#000;margin-top: 5px;">下沟照片:</text>
 							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; ">
 								<image :src="loadImgSrc('updateimg.png')" mode=""
-									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage(2,key)">
+									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; "
+									@click="chooseimage(2,key)">
 								</image>
-								<view v-for="(item,index) in  value.legBackfilling" :key="index" style="position: relative;">
+								<view v-for="(item,index) in  value.legBackfilling" :key="index"
+									style="position: relative;">
 									<view
 										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
-										<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+										<image :src="item" mode=""
+											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
 											@click="showPhoto(index,value.legBackfilling)">
 										</image>
 									</view>
 									<view v-else>
-										<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										<video :src="item"
+											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
 									</view>
 									<view @click="removeht(index,key,2)"
 										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
@@ -123,26 +131,30 @@
 									</view>
 								</view>
 							</view>
+						</view>
 					</view>
-					</view>
-					
-<view class="uni-media-list-text-top">
-					<view class="uni-common-mt" style="width: 100%;">
-						<text class="tit-text" style=" font-size: 13px;color:
+
+					<view class="uni-media-list-text-top">
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="tit-text" style=" font-size: 13px;color:
 							#000;margin-top: 5px;">回填照片:</text>
 							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; ">
 								<image :src="loadImgSrc('updateimg.png')" mode=""
-									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage(3,key)">
+									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; "
+									@click="chooseimage(3,key)">
 								</image>
-								<view v-for="(item,index) in  value.inferiorSulcus" :key="index" style="position: relative;">
+								<view v-for="(item,index) in  value.inferiorSulcus" :key="index"
+									style="position: relative;">
 									<view
 										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
-										<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+										<image :src="item" mode=""
+											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
 											@click="showPhoto(index,value.inferiorSulcus)">
 										</image>
 									</view>
 									<view v-else>
-										<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+										<video :src="item"
+											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
 									</view>
 									<view @click="removeht(index,key,3)"
 										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
@@ -151,8 +163,8 @@
 									</view>
 								</view>
 							</view>
-					</view>
 						</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -221,11 +233,24 @@
 
 				getHistoryDetails(this.nodeId, this.type).then(response => {
 					if (response.data.zEngineeringNodeBo != null) {
-						this.hideButton = false;
-						this.dataJson = response.data;
-						this.title = response.data.zEngineeringNodeBo.type;
-						this.enginType = response.data.enginType;
-						this.enginClassification = response.data.enginClassification;
+						let flag = false;
+						for (let i in response.data.zEngineeringNodeBo.zEngineeringInfoBoList) {
+							if (response.data.zEngineeringNodeBo.zEngineeringInfoBoList[i].createBy == this.$user
+								.state.name) {
+								flag = true;
+								break;
+							}
+						}
+						if (flag) {
+							this.hideButton = false;
+							this.dataJson = response.data;
+							this.title = response.data.zEngineeringNodeBo.type;
+							this.enginType = response.data.enginType;
+							this.enginClassification = response.data.enginClassification;
+						} else {
+							this.hideButton = true;
+							this.$modal.msg("暂无本人历史信息")
+						}
 					} else {
 						this.hideButton = true;
 						this.$modal.msg("暂无历史信息")