开栓历史详情以及修改

api/common.js

@@ -1,5 +1,28 @@
 import request from '@/utils/request'
 
+
+// 获取  开栓详情
+export function getOpenBoltHistoryDetails(id) {
+
+	return request({
+		'url': '/zdsz/engineeringGasOpening/' + id,
+		'method': 'get',
+	})
+}
+// 开栓新增
+export function AddOpenBolt(type, param, id) {
+	let method = type == 'edit' ? 'put' : 'post'
+	if (type == 'edit') {
+		param['state'] = '0'
+		param['id'] = id
+	}
+	return request({
+		'url': '/zdsz/engineeringGasOpening',
+		'method': method,
+		'data': param
+	})
+}
+
 // 获取 房间现住人电话
 export function getRoomDetails(id) {
 
@@ -33,6 +56,15 @@ export function getHistoryDetails(id, name) {
 		'method': 'get',
 	})
 }
+
+export function getKShistoryList(param) {
+
+	return request({
+		'url': '/zdsz/engineeringGasOpening/list',
+		'method': 'get',
+		'data': param
+	})
+}
 //  通过身份查询历史 
 export function gethistoryList(param) {
 

config.js

@@ -2,8 +2,8 @@
 module.exports = {
 	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
 	//baseUrl: 'http://192.168.4.88:8080',
-	//baseUrl: 'http://192.168.4.23:8080',
-	baseUrl: 'http://192.168.4.20:8080',
+	baseUrl: 'http://192.168.4.23:8080',
+	//baseUrl: 'http://192.168.4.20:8080',
 	// baseUrl: 'http://192.168.4.14:8089',
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',
 	// 应用信息

pages.json

@@ -93,7 +93,7 @@
 
 				"enablePullDownRefresh ": true
 			}
-		}, 
+		},
 		{
 			"path": "pages/statistics/historyDetails",
 			"style": {
@@ -107,6 +107,7 @@
 
 			}
 		},
+		
 		{
 			"path": "pages/statistics/history_details_bottom_leg",
 			"style": {
@@ -134,11 +135,10 @@
 			}
 		},
 		{
-			"path" : "pages/surge_tank/surge_tank",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false
+			"path": "pages/surge_tank/surge_tank",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
 			}
 		}
 

pages/open_bolt/open_bolt.vue

@@ -352,11 +352,11 @@
 				</view>
 				<view class="container" style="border-bottom: 1px solid #f8f8f8;" v-if="isPipeChangeValue=='是'">
 					<view class="uni-list-cell-left">
-						阀管类型
+						阀管改造类型
 					</view>
 					<view v-if="this.isEmpty(this.PipeType.dictValue)" class="uni-list-cell-db" style="margin-top: 10;"
 						@click="pickerShow('fglx')">
-						<span style="color: darkgray;">请选择阀管类型</span>
+						<span style="color: darkgray;">请选择阀管改造类型</span>
 						<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 					</view>
 					<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('fglx')">
@@ -551,6 +551,8 @@
 			openBolt,
 			getRoomProjectList,
 			getRoomProjectId,
+			AddOpenBolt,
+			getOpenBoltHistoryDetails
 		} from '@/api/common';
 		import {
 			getToken
@@ -632,13 +634,104 @@
 					progress: 0, //上传图片进度百分比
 					loading: false,
 					historyList: {}, //历史数据
+					nodeId: '',
+					nodeType: '',
+					createTime: null,
 				}
 			},
-			onLoad(options) {
 
+			onLoad(options) {
 				uni.setNavigationBarTitle({
 					title: '开栓'
 				})
+				if ('params' in options) {
+					let e = JSON.parse(decodeURIComponent(options.params));
+
+					this.nodeType = e.type;
+					if (e.type == 'edit') {
+						this.nodeId = e.id;
+
+
+						getOpenBoltHistoryDetails(this.nodeId).then(res => {
+							let response = res.data;
+							this.createTime = response.createTime;
+							this.XZQValue.dictValue = response.district;
+							this.XZQValue.dictLabel = response.districtName;
+							this.XQValue.id = response.areaId;
+							this.XQValue.name = response.areaName;
+							this.LDValue.id = response.buildingId;
+							this.LDValue.name = response.buildingName;
+							this.DYValue.id = response.unitId;
+							this.DYValue.name = response.unitName;
+							this.FJValue.id = response.houseId;
+							this.FJValue.name = response.houseName;
+
+							this.openBoltKey = response.isAntiCorrosionPaint;
+							this.openBoltValue = response.isAntiCorrosionPaint == 'Y' ? '是' : '否';
+
+							this.barClamptKey = response.isVerticalBarClamp;
+							this.barClamptValue = response.isVerticalBarClamp == 'Y' ? '是' : '否';
+
+							this.imgArr = response.gasCylinderPic;
+
+
+							this.barTestValue = response.verticalBarTest;
+							this.singleValue = response.householdTest;
+							this.imgArr2 = response.pressureTestPic;
+
+							this.tableNumber = response.gasMeterNumber;
+							this.tableCharacters = response.gasMeterCount;
+							this.brankValue = response.gasMeterBrand;
+							this.tableModel = response.gasMeterType;
+
+							this.direction = {
+								dictValue: response.gasMeterDirection,
+								dictLabel: response.gasMeterDirectionName
+							};
+							this.imgArr3 = response.gasMeterPic;
+
+							this.isFixationId = response.isRearPipeClamp;
+							this.isFixationValue = response.isRearPipeClamp == 'Y' ? '是' : '否';
+							this.imgArr4 = response.rearPipePic;
+
+							this.isPipeChangeId = response.isGasChangeType;
+							this.isPipeChangeValue = response.isGasChangeType == 'Y' ? '是' : '否';
+							this.PipeType = {
+								dictValue: response.gasChangeType,
+								dictLabel: response.gasChangeTypeName
+							};
+							this.imgArr5 = response.gasChangePic;
+
+							this.imgArr6 = response.softPipePic;
+
+							this.isUseWindproofId = response.isWindproofCircle;
+							this.isUseWindproofValue = response.isWindproofCircle == 'Y' ? '是' : '否';
+							this.imgArr7 = response.windproofCirclePic;
+
+							this.imgArr8 = response.gasEnvironmentPic;
+							this.imgArr9 = response.receiptFormPic;
+							getAreaList(this.XZQValue.dictValue).then(res => {
+								this.XQList = res.data;
+							})
+							getBuildingList(this.XQValue.id).then(res => {
+								this.LDList = res.data
+							})
+
+
+							getUnitList(this.LDValue.id).then(res => {
+								this.DYList = res.data
+							})
+
+
+
+							getHousesList(this.DYValue.id).then(res => {
+								this.FJList = res.data
+							})
+
+						});
+					}
+
+				}
 			},
 			methods: {
 				//判断是否选择
@@ -674,7 +767,7 @@
 					} else if (this.imgArr4.length <= 0) {
 						this.$modal.msg("请上传表后管照片")
 					} else if (this.isPipeChangeValue == '是' && this.isEmpty(this.PipeType.dictValue)) {
-						this.$modal.msg("请选择阀管类型")
+						this.$modal.msg("请选择阀管改造类型")
 					} else if (this.imgArr5.length <= 0) {
 						this.$modal.msg("请上传灶前阀门照片")
 					} else if (this.imgArr6.length <= 0) {
@@ -693,12 +786,41 @@
 							buildingId: this.LDValue.id,
 							unitId: this.DYValue.id,
 							houseId: this.FJValue.id,
-							type: 1,
-							isQualified: this.openBoltKey,
-							remark: this.remark,
-							picIds: this.imgArr
+
+							isAntiCorrosionPaint: this.openBoltKey,
+							isVerticalBarClamp: this.barClamptKey,
+							gasCylinderPic: this.imgArr,
+
+
+							verticalBarTest: this.barTestValue,
+							householdTest: this.singleValue,
+							pressureTestPic: this.imgArr2,
+
+							gasMeterNumber: this.tableNumber,
+							gasMeterCount: this.tableCharacters,
+							gasMeterBrand: this.brankValue,
+							gasMeterType: this.tableModel,
+							gasMeterDirection: this.direction.dictValue,
+							gasMeterPic: this.imgArr3,
+
+							isRearPipeClamp: this.isFixationId,
+							rearPipePic: this.imgArr4,
+
+							isGasChangeType: this.isPipeChangeId,
+							gasChangeType: this.PipeType.dictValue,
+							gasChangePic: this.imgArr5,
+
+							softPipePic: this.imgArr6,
+
+							isWindproofCircle: this.isUseWindproofId,
+							windproofCirclePic: this.imgArr7,
+
+							gasEnvironmentPic: this.imgArr8,
+							receiptFormPic: this.imgArr9,
+							createTime: this.createTime,
+
 						}
-						openBolt(param).then(res => {
+						AddOpenBolt(this.nodeType, param, this.nodeId).then(res => {
 							uni.hideLoading()
 							if (res.code == '200') {
 								uni.showToast({
@@ -1047,9 +1169,10 @@
 						this.XZQValue = item;
 
 						//根据行政区id获取小区数据
-						this.XQValue = ''; //重置小区数据
-						this.LDValue = ''; //重置楼栋数据
-						this.DYValue = ''; //重置单元数据
+						this.XQValue = '';
+						this.LDValue = '';
+						this.DYValue = '';
+						this.FJValue = '';
 						getAreaList(item.dictValue).then(res => {
 							this.XQList = res.data;
 						})
@@ -1062,22 +1185,23 @@
 					if (this.type == 'xq') {
 						this.XQValue = item;
 						//根据小区id 获取楼栋数据
-						this.LDValue = ''; //重置楼栋数据
-						this.DYValue = ''; //重置单元数据
+						this.LDValue = '';
+						this.DYValue = '';
+						this.FJValue = '';
 						getBuildingList(item.id).then(res => {
 							this.LDList = res.data
 						})
 					} else if (this.type == 'ld') {
 						this.LDValue = item;
-						//根据楼栋ID 获取单元数据
-						this.DYValue = ''; //重置单元数据
-						this.FJValue = ''; //重置房间数据
+
+						this.DYValue = '';
+						this.FJValue = '';
 						getUnitList(item.id).then(res => {
 							this.DYList = res.data
 						})
 					} else if (this.type == 'dy') {
-						this.DYValue = item; //根据单元数据 获取房间数据 
-						this.FJValue = ''; //重置房间数据
+						this.DYValue = item;
+						this.FJValue = '';
 						getHousesList(item.id).then(res => {
 							this.FJList = res.data
 						})

pages/statistics/statistics.vue

@@ -258,150 +258,179 @@
 					</view>
 				</view>
 				<view v-show="change" style="padding-right: 10px;">
-
 					<view class="uni-list">
 						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-							<view>
-								行政区
+							<view class="uni-list-cell-left">
+								工程项
 							</view>
-							<view v-if="this.isEmpty(this.XZQValue3.dictValue)" style="margin-top: 10;"
-								@click="pickerShow('xzq3')">
-								<span style="color: darkgray;">请选择行政区</span>
+							<view v-if="this.isEmpty(this.EngineeringValue)" class="uni-list-cell-db"
+								style="margin-top: 10;" @click="pickerShow('gcx')">
+								<span style="color: darkgray;">请选择工程项</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
-							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xzq3')">
-								<span style="color: black;">{{XZQValue3.dictLabel}}</span>
+							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcx')">
+								<span style="color: black;">{{EngineeringValue}}</span>
 								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
-
 						</view>
 					</view>
-					<view class="uni-list">
-						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-							<view>
-								小区
-							</view>
+					<view v-if="EngineeringValue=='民用工程'||EngineeringValue=='开栓'">
+						<view class="uni-list">
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+								<view>
+									行政区
+								</view>
+								<view v-if="this.isEmpty(this.XZQValue3.dictValue)" style="margin-top: 10;"
+									@click="pickerShow('xzq3')">
+									<span style="color: darkgray;">请选择行政区</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
+								<view v-else class="uni-list-cell-db" style="margin-top: 10;"
+									@click="pickerShow('xzq3')">
+									<span style="color: black;">{{XZQValue3.dictLabel}}</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
 
-							<view v-if="this.isEmpty(this.XQValue3.id)" class="uni-list-cell-db" style="margin-top: 10;"
-								@click="pickerShow('xq3')">
-								<span style="color: darkgray;">请选择小区</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-							</view>
-							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq3')">
-								<span style="color: black;">{{XQValue3.name}}</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
 						</view>
-					</view>
-					<view class="uni-list">
-						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-							<view class="uni-list-cell-left">
-								楼栋
-							</view>
-							<view v-if="this.isEmpty(this.LDValue3.id)" class="uni-list-cell-db" style="margin-top: 10;"
-								@click="pickerShow('ld3')">
-								<span style="color: darkgray;">请选择楼栋</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-							</view>
-							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld3')">
-								<span style="color: black;">{{LDValue3.name}}</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						<view class="uni-list">
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+								<view>
+									小区
+								</view>
+
+								<view v-if="this.isEmpty(this.XQValue3.id)" class="uni-list-cell-db"
+									style="margin-top: 10;" @click="pickerShow('xq3')">
+									<span style="color: darkgray;">请选择小区</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
+								<view v-else class="uni-list-cell-db" style="margin-top: 10;"
+									@click="pickerShow('xq3')">
+									<span style="color: black;">{{XQValue3.name}}</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
 							</view>
 						</view>
-					</view>
-					<view class="uni-list" style="margin-top: 10;">
-						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-							<view class="uni-list-cell-left">
-								单元
-							</view>
-							<view v-if="this.isEmpty(this.DYValue3.id)" class="uni-list-cell-db" style="margin-top: 10;"
-								@click="pickerShow('dy3')">
-								<span style="color: darkgray;">请选择单元</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-							</view>
-							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('dy3')">
-								<span style="color: black;">{{DYValue3.name}}</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						<view class="uni-list">
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+								<view class="uni-list-cell-left">
+									楼栋
+								</view>
+								<view v-if="this.isEmpty(this.LDValue3.id)" class="uni-list-cell-db"
+									style="margin-top: 10;" @click="pickerShow('ld3')">
+									<span style="color: darkgray;">请选择楼栋</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
+								<view v-else class="uni-list-cell-db" style="margin-top: 10;"
+									@click="pickerShow('ld3')">
+									<span style="color: black;">{{LDValue3.name}}</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
 							</view>
 						</view>
-					</view>
-					<view class="uni-list">
-						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-							<view class="uni-list-cell-left">
-								房间
-							</view>
-							<view v-if="this.isEmpty(this.FJValue3.id)" class="uni-list-cell-db" style="margin-top: 10;"
-								@click="pickerShow('fj3')">
-								<span style="color: darkgray;">请选择房间</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-							</view>
-							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('fj3')">
-								<span style="color: black;">{{FJValue3.name}}</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						<view class="uni-list" style="margin-top: 10;">
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+								<view class="uni-list-cell-left">
+									单元
+								</view>
+								<view v-if="this.isEmpty(this.DYValue3.id)" class="uni-list-cell-db"
+									style="margin-top: 10;" @click="pickerShow('dy3')">
+									<span style="color: darkgray;">请选择单元</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
+								<view v-else class="uni-list-cell-db" style="margin-top: 10;"
+									@click="pickerShow('dy3')">
+									<span style="color: black;">{{DYValue3.name}}</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
 							</view>
 						</view>
-					</view>
-					<view class="uni-list">
-						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-							<view class="uni-list-cell-left">
-								工程类型
-							</view>
-							<view v-if="this.isEmpty(this.ProjectType.dictValue)" class="uni-list-cell-db"
-								style="margin-top: 10;" @click="pickerShow('gclx')">
-								<span style="color: darkgray;">请选择工程类型</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-							</view>
-							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gclx')">
-								<span style="color: black;">{{ProjectType.dictLabel}}</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						<view class="uni-list">
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+								<view class="uni-list-cell-left">
+									房间
+								</view>
+								<view v-if="this.isEmpty(this.FJValue3.id)" class="uni-list-cell-db"
+									style="margin-top: 10;" @click="pickerShow('fj3')">
+									<span style="color: darkgray;">请选择房间</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
+								<view v-else class="uni-list-cell-db" style="margin-top: 10;"
+									@click="pickerShow('fj3')">
+									<span style="color: black;">{{FJValue3.name}}</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
 							</view>
 						</view>
-					</view>
-					<view class="uni-list">
-						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-							<view class="uni-list-cell-left">
-								工程分类
-							</view>
-							<view v-if="this.isEmpty(this.ProjectClassification.dictValue)" class="uni-list-cell-db"
-								style="margin-top: 10;" @click="pickerShow('gcfl')">
-								<span style="color: darkgray;">请选择工程分类</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-							</view>
-							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcfl')">
-								<span style="color: black;">{{ProjectClassification.dictLabel}}</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+
+						<view class="uni-list" v-if="EngineeringValue!='开栓'">
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+								<view class="uni-list-cell-left">
+									工程类型
+								</view>
+								<view v-if="this.isEmpty(this.ProjectType.dictValue)" class="uni-list-cell-db"
+									style="margin-top: 10;" @click="pickerShow('gclx')">
+									<span style="color: darkgray;">请选择工程类型</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
+								<view v-else class="uni-list-cell-db" style="margin-top: 10;"
+									@click="pickerShow('gclx')">
+									<span style="color: black;">{{ProjectType.dictLabel}}</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
 							</view>
 						</view>
 					</view>
-					<view class="uni-list">
-						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-							<view class="uni-list-cell-left">
-								工程步骤
-							</view>
-							<view v-if="this.isEmpty(this.ProjectSteps.dictValue)" class="uni-list-cell-db"
-								style="margin-top: 10;" @click="pickerShow('gcbz')">
-								<span style="color: darkgray;">请选择工程步骤</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-							</view>
-							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcbz')">
-								<span style="color: black;">{{ProjectSteps.dictLabel}}</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					<view v-if="EngineeringValue!='开栓'">
+						<view class="uni-list">
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+								<view class="uni-list-cell-left">
+									工程分类
+								</view>
+								<view v-if="this.isEmpty(this.ProjectClassification.dictValue)" class="uni-list-cell-db"
+									style="margin-top: 10;" @click="pickerShow('gcfl')">
+									<span style="color: darkgray;">请选择工程分类</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
+								<view v-else class="uni-list-cell-db" style="margin-top: 10;"
+									@click="pickerShow('gcfl')">
+									<span style="color: black;">{{ProjectClassification.dictLabel}}</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
 							</view>
 						</view>
-					</view>
-					<view class="uni-list">
-						<view class="container" style="border-bottom: 1px solid #f8f8f8;">
-							<view class="uni-list-cell-left">
-								审核状态
-							</view>
-							<view v-if="this.isEmpty(this.ReviewStatus.dictValue)" class="uni-list-cell-db"
-								style="margin-top: 10;" @click="pickerShow('shzt')">
-								<span style="color: darkgray;">请选择审核状态</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						<view class="uni-list">
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+								<view class="uni-list-cell-left">
+									工程步骤
+								</view>
+								<view v-if="this.isEmpty(this.ProjectSteps.dictValue)" class="uni-list-cell-db"
+									style="margin-top: 10;" @click="pickerShow('gcbz')">
+									<span style="color: darkgray;">请选择工程步骤</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
+								<view v-else class="uni-list-cell-db" style="margin-top: 10;"
+									@click="pickerShow('gcbz')">
+									<span style="color: black;">{{ProjectSteps.dictLabel}}</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
 							</view>
-							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('shzt')">
-								<span style="color: black;">{{ReviewStatus.dictLabel}}</span>
-								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						</view>
+						<view class="uni-list">
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+								<view class="uni-list-cell-left">
+									审核状态
+								</view>
+								<view v-if="this.isEmpty(this.ReviewStatus.dictValue)" class="uni-list-cell-db"
+									style="margin-top: 10;" @click="pickerShow('shzt')">
+									<span style="color: darkgray;">请选择审核状态</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
+								<view v-else class="uni-list-cell-db" style="margin-top: 10;"
+									@click="pickerShow('shzt')">
+									<span style="color: black;">{{ReviewStatus.dictLabel}}</span>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -411,14 +440,25 @@
 			<cc-pullScroolView class="pullScrollView" ref="pullScroll" :pullDown="pullDown" :isDownLoading="true">
 				<view class="notice" v-for="(item,index) in list" :key="index">
 					<view class="justify-content" @click="chooseNode(item)">
-						<view class="font-forty">
-							{{item.areaName+item.buildingName+item.unitName+item.houseName+(item.enginType=='new_built'? '-新建':'-旧改')+'-'+item.enginClassificationName}}
+						<view v-if="EngineeringValue=='民用工程'">
+							<view class="font-forty">
+								{{item.areaName+item.buildingName+item.unitName+item.houseName+(item.enginType=='new_built'? '-新建':'-旧改')+'-'+item.enginClassificationName}}
+							</view>
+							<view class="font-twenty-eight gray" v-for="(state,stateIndex) in item.nodeReViewStateList"
+								:key="stateIndex" v-if="state.Type!='开栓'">
+								{{state.Type}}-{{state.state == 1 ? '审核通过': (state.content == '暂未审核' ? '暂未审核':'审核未通过')}}
+								<view v-if="state.content != '暂未审核'">原因：{{state.content}}</view>
+							</view>
 						</view>
-						<view class="font-twenty-eight gray" v-for="(state,stateIndex) in item.nodeReViewStateList"
-							:key="stateIndex" v-if="state.Type!='开栓'">
-							{{state.Type}}-{{state.state == 1 ? '审核通过': (state.content == '暂未审核' ? '暂未审核':'审核未通过')}}
-							<view v-if="state.content != '暂未审核'">原因：{{state.content}}</view>
+						<view v-if="EngineeringValue=='开栓'">
+							<view class="font-forty">
+								{{item.areaName+item.buildingName+item.unitName+item.houseName}}
+							</view>
+							<view class="font-twenty-eight gray">
+								{{item.state == 0 ? '未审核': (item.state == 1?'审核通过':'审核不通过')}}
+							</view>
 						</view>
+
 						<view class="font-twenty-eight gray">
 							{{item.createTime}}
 						</view>
@@ -465,6 +505,7 @@
 	import CCBProjectList from '../../uni_modules/cc-pullScroolView/components/cc-pullScroolView/cc-pullScroolView.vue';
 	import {
 		gethistoryList,
+		getKShistoryList,
 	} from '@/api/common'
 
 	import {
@@ -536,6 +577,8 @@
 				projectValue2: {
 					'dictValue': '0'
 				},
+				EngineeringValue: '',
+				EngineeringList: [],
 				shareState: false,
 				XZQValue2: {},
 				XQValue2: {},
@@ -568,11 +611,13 @@
 		created() {},
 		onLoad() {
 			this.isLeader = getUserType()
-
+			this.EngineeringValue = this.userRole[0];
 			if (this.isLeader == 'app_user') {
 				this.changeTab();
 			}
 
+
+
 		},
 
 		// 上拉加载
@@ -622,23 +667,43 @@
 				this.shareState = false;
 			},
 
+
 			chooseNode(item) {
-				this.typeList = item.nodeReViewStateList
-				this.nodeId = item.id;
-				this.nodeType = item.enginClassification;
-				this.roomId = item.houseId;
-				if (this.nodeType == 'bottom_leg') { //底腿
+
+				if (this.EngineeringValue == '民用工程') {
+
+
+					this.typeList = item.nodeReViewStateList
+					this.nodeId = item.id;
+					this.nodeType = item.enginClassification;
+					this.roomId = item.houseId;
+					if (this.nodeType == 'bottom_leg') { //底腿
+						let obj = {
+							id: this.nodeId,
+							type: item.Type
+						};
+						uni.navigateTo({
+							url: '/pages/statistics/history_details_bottom_leg?params=' + encodeURIComponent(JSON
+								.stringify(
+									obj))
+						})
+
+					} else {
+						this.handleShowSheet();
+					}
+				} else if (this.EngineeringValue == '开栓') {
+
+					this.nodeId = item.id;
+
 					let obj = {
+						type: 'edit',
 						id: this.nodeId,
-						type: item.Type
 					};
 					uni.navigateTo({
-						url: '/pages/statistics/history_details_bottom_leg?params=' + encodeURIComponent(JSON
+						url: '/pages/open_bolt/open_bolt?params=' + encodeURIComponent(JSON
 							.stringify(
 								obj))
 					})
-				} else {
-					this.handleShowSheet();
 				}
 			},
 			showHistoryList() {
@@ -715,7 +780,20 @@
 			},
 			pickerShow(e) {
 				this.type = e;
-				if (e == 'gczq') {
+				if (e == 'gcx') {
+					this.open = true;
+					this.EngineeringList = [];
+					this.userRole.forEach((item, index) => {
+
+						this.EngineeringList.push({
+							'id': index,
+							'name': item
+						})
+
+					});
+
+					this.selectList = this.EngineeringList;
+				} else if (e == 'gczq') {
 					this.openDict = true;
 					getDicts("engin_cycle").then(response => {
 						this.dictOptions = response.data;
@@ -893,7 +971,11 @@
 
 				this.open = false;
 				this.openDict = false;
-				if (this.type == 'xzq') {
+				if (this.type == 'gcx') {
+					this.EngineeringValue = item.name
+					this.changeTab();
+
+				} else if (this.type == 'xzq') {
 					this.XZQValue = item;
 
 
@@ -1110,67 +1192,118 @@
 				this.totalNum = '';
 				this.pageNum = 1;
 
+
 				this.requestData();
 
 			},
 			requestData() {
 
 				uni.showLoading()
+				if (this.EngineeringValue == '民用工程') {
+					let type = ''
+					let param = {
+						district: this.XZQValue3.dictValue == undefined ? '' : this.XZQValue3.dictValue,
+						areaId: this.XQValue3.id == undefined ? '' : this.XQValue3.id,
+						buildingId: this.LDValue3.id == undefined ? '' : this.LDValue3.id,
+						unitId: this.DYValue3.id == undefined ? '' : this.DYValue3.id,
+						houseId: this.FJValue3.id == undefined ? '' : this.FJValue3.id,
+						enginType: this.ProjectType.dictValue == undefined ? '' : this.ProjectType.dictValue,
+						enginCycle: '0',
+						enginClassification: this.ProjectClassification.dictValue == undefined ? '' : this
+							.ProjectClassification.dictValue,
+						type: this.ProjectSteps.dictValue == undefined ? '' : this.ProjectSteps.dictValue,
+						completionStatus: this.ReviewStatus.dictValue == undefined ? '' : this.ReviewStatus.dictValue,
+						createBy: user.state.name,
+						pageNum: this.pageNum,
+						pageSize: this.pageSize
 
-				let type = ''
-				let param = {
-					district: this.XZQValue3.dictValue == undefined ? '' : this.XZQValue3.dictValue,
-					areaId: this.XQValue3.id == undefined ? '' : this.XQValue3.id,
-					buildingId: this.LDValue3.id == undefined ? '' : this.LDValue3.id,
-					unitId: this.DYValue3.id == undefined ? '' : this.DYValue3.id,
-					houseId: this.FJValue3.id == undefined ? '' : this.FJValue3.id,
-					enginType: this.ProjectType.dictValue == undefined ? '' : this.ProjectType.dictValue,
-					enginCycle: '0',
-					enginClassification: this.ProjectClassification.dictValue == undefined ? '' : this
-						.ProjectClassification.dictValue,
-					type: this.ProjectSteps.dictValue == undefined ? '' : this.ProjectSteps.dictValue,
-					completionStatus: this.ReviewStatus.dictValue == undefined ? '' : this.ReviewStatus.dictValue,
-					createBy: user.state.name,
-					pageNum: this.pageNum,
-					pageSize: this.pageSize
+					}
+					gethistoryList(param).then(res => {
 
-				}
-				gethistoryList(param).then(res => {
+						this.totalNum = res.total
 
-					this.totalNum = res.total
+						if (res.code == '200') {
+							uni.hideLoading()
+							if (res.rows.length !== 0) {
 
-					if (res.code == '200') {
-						uni.hideLoading()
-						if (res.rows.length !== 0) {
+								if (this.pageNum == 1) {
+									this.list = [];
+									this.list = res.rows
+								} else {
+									this.list = this.list.concat(res.rows)
+								}
 
-							if (this.pageNum == 1) {
-								this.list = [];
-								this.list = res.rows
-							} else {
-								this.list = this.list.concat(res.rows)
-							}
 
+								if (this.pageNum * 10 >= this.totalNum) {
+									this.$refs.pullScroll.finish();
 
-							if (this.pageNum * 10 >= this.totalNum) {
-								this.$refs.pullScroll.finish();
+								} else {
 
-							} else {
 
+									this.$refs.pullScroll.success();
+								}
 
-								this.$refs.pullScroll.success();
+							} else {
+								this.list = [];
+								this.$refs.pullScroll.empty();
 							}
-
 						} else {
-							this.list = [];
-							this.$refs.pullScroll.empty();
+							this.$modal.msg(res.msg + "")
+							this.$refs.pullScroll.error();
 						}
-					} else {
-						this.$modal.msg(res.msg + "")
-						this.$refs.pullScroll.error();
+
+					})
+
+				} else if (this.EngineeringValue == '开栓') {
+					let type = ''
+					let param = {
+						district: this.XZQValue3.dictValue == undefined ? '' : this.XZQValue3.dictValue,
+						areaId: this.XQValue3.id == undefined ? '' : this.XQValue3.id,
+						buildingId: this.LDValue3.id == undefined ? '' : this.LDValue3.id,
+						unitId: this.DYValue3.id == undefined ? '' : this.DYValue3.id,
+						houseId: this.FJValue3.id == undefined ? '' : this.FJValue3.id,
+
+						createBy: user.state.name,
+						pageNum: this.pageNum,
+						pageSize: this.pageSize
+
 					}
+					getKShistoryList(param).then(res => {
 
-				})
+						this.totalNum = res.total
+
+						if (res.code == '200') {
+							uni.hideLoading()
+							if (res.rows.length !== 0) {
+
+								if (this.pageNum == 1) {
+									this.list = [];
+									this.list = res.rows
+								} else {
+									this.list = this.list.concat(res.rows)
+								}
+
+
+								if (this.pageNum * 10 >= this.totalNum) {
+									this.$refs.pullScroll.finish();
 
+								} else {
+
+
+									this.$refs.pullScroll.success();
+								}
+
+							} else {
+								this.list = [];
+								this.$refs.pullScroll.empty();
+							}
+						} else {
+							this.$modal.msg(res.msg + "")
+							this.$refs.pullScroll.error();
+						}
+
+					})
+				}
 			},
 
 		}

pages/work/index.vue

@@ -501,8 +501,13 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 				})
 			},
 			showOpenBolt() {
+				let obj = {
+					type: 'new'
+				};
 				uni.navigateTo({
-					url: '/pages/open_bolt/open_bolt'
+					url: '/pages/open_bolt/open_bolt?params=' + encodeURIComponent(JSON
+						.stringify(
+							obj))
 				})
 			}
 		}