1

api/common.js

@@ -1,6 +1,13 @@
 import request from '@/utils/request'
 
-
+export function getHistoryByUserList(param) {
+	//type 1 = 顶管， 2=基建 3=危险 4= 市政 5= 工业
+	return request({
+		'url': '/zdsz/engineeringIndustry/getByUserList',
+		'method': 'get',
+		'data': param
+	})
+}
 // 获取  开栓详情
 export function getOpenBoltHistoryDetails(id) {
 
@@ -13,7 +20,7 @@ export function getOpenBoltHistoryDetails(id) {
 export function AddOpenBolt(type, param, id) {
 	let method = type == 'edit' ? 'put' : 'post'
 	if (type == 'edit') {
-		param['state'] = '0'
+		param['state'] = '2'
 		param['id'] = id
 	}
 	return request({
@@ -408,7 +415,7 @@ export function submitGasSealingProject(param) {
 //列表 带气封堵施工工程
 export function getGasSealingHistoryList(id, type) {
 	return request({
-		'url': '/zdsz/engineeringAirWall/'+id+'/'+type,
+		'url': '/zdsz/engineeringAirWall/' + id + '/' + type,
 		'method': 'get',
 	})
 }

pages/open_bolt/open_bolt.vue

@@ -213,7 +213,7 @@
 					</view>
 
 					<view class="uni-list-cell-db" style="margin-top: 10;">
-						<input class="uni-input" type="text" v-model="tableNumber"
+						<input class="uni-input" type="text" v-model="tableNumber" maxlength="50" placeholder="请输入表号"
 							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 					</view>
 				</view>
@@ -223,7 +223,7 @@
 					</view>
 
 					<view class="uni-list-cell-db" style="margin-top: 10;">
-						<input class="uni-input" type="text" v-model="tableCharacters"
+						<input class="uni-input" type="text" v-model="tableCharacters" maxlength="50" placeholder="请输入表字"
 							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 					</view>
 				</view>
@@ -233,7 +233,7 @@
 					</view>
 
 					<view class="uni-list-cell-db" style="margin-top: 10;">
-						<input class="uni-input" type="text" v-model="brankValue"
+						<input class="uni-input" type="text" v-model="brankValue" maxlength="50" placeholder="请输入品牌"
 							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 					</view>
 				</view>
@@ -245,7 +245,7 @@
 					</view>
 
 					<view class="uni-list-cell-db" style="margin-top: 10;">
-						<input class="uni-input" type="text" v-model="tableModel"
+						<input class="uni-input" type="text" v-model="tableModel" maxlength="50" placeholder="请输入型号"
 							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 					</view>
 				</view>

pages/statistics/statistics.vue

@@ -363,7 +363,7 @@
 							</view>
 						</view>
 
-						<view class="uni-list" v-if="EngineeringValue!='开栓'">
+						<view class="uni-list" v-if="EngineeringValue=='民用工程'">
 							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 								<view class="uni-list-cell-left">
 									工程类型
@@ -381,8 +381,23 @@
 							</view>
 						</view>
 					</view>
+
+
 					<view v-if="EngineeringValue!='开栓'">
-						<view class="uni-list">
+						<view class="container" style="border-bottom: 1px solid #f8f8f8;"
+							v-if="EngineeringValue!='民用工程'">
+							<view class="uni-list-cell-left">
+								工程名称
+							</view>
+
+							<view class="uni-list-cell-db" style="margin-top: 10;">
+								<input class="uni-input" type="text" v-model="EngineeringName" maxlength="80"
+									placeholder="请输入工程名称"
+									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+							</view>
+						</view>
+						<view class="uni-list"
+							v-if="EngineeringValue=='工业工程'||EngineeringValue=='带气封堵施工'||EngineeringValue=='民用工程'">
 							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 								<view class="uni-list-cell-left">
 									工程分类
@@ -399,7 +414,8 @@
 								</view>
 							</view>
 						</view>
-						<view class="uni-list">
+						<view class="uni-list"
+							v-if="EngineeringValue=='市政工程'||EngineeringValue=='顶管工程'||EngineeringValue=='民用工程'||EngineeringValue=='基建工程'">
 							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 								<view class="uni-list-cell-left">
 									工程步骤
@@ -416,23 +432,23 @@
 								</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>
-								<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 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>
 					<button class="tj-btn" style="margin: 40rpx 90rpx;" @click="serch"> 搜索</button>
 				</view>
@@ -455,7 +471,7 @@
 								{{item.areaName+item.buildingName+item.unitName+item.houseName}}
 							</view>
 							<view class="font-twenty-eight gray">
-								{{item.state == 0 ? '未审核': (item.state == 1?'审核通过':'审核不通过')}}
+								{{item.state == 0 ? '审核不通过': (item.state == 1?'审核通过':'未审核')}}
 							</view>
 						</view>
 
@@ -578,6 +594,7 @@
 					'dictValue': '0'
 				},
 				EngineeringValue: '',
+				EngineeringName: '',
 				EngineeringList: [],
 				shareState: false,
 				XZQValue2: {},
@@ -828,9 +845,18 @@
 							});
 					}
 				} else if (e == 'shzt') {
-					if (this.isEmpty(this.ProjectSteps.dictValue)) {
-						this.$modal.msg('请选择工程步骤')
+					if (this.EngineeringValue == '民用工程') {
+						if (this.isEmpty(this.ProjectSteps.dictValue)) {
+							this.$modal.msg('请选择工程步骤')
+
+						} else {
+							this.openDict = true;
+							getDicts('state_options').then(
+								response => {
+									this.dictOptions = response.data;
 
+								});
+						}
 					} else {
 						this.openDict = true;
 						getDicts('state_options').then(
@@ -839,6 +865,7 @@
 
 							});
 					}
+
 				} else if (e == 'xzq') {
 					if (this.isEmpty(this.projectValue.dictValue)) {
 						this.$modal.msg('请选择工程周期')
@@ -1262,7 +1289,7 @@
 						buildingId: this.LDValue3.id == undefined ? '' : this.LDValue3.id,
 						unitId: this.DYValue3.id == undefined ? '' : this.DYValue3.id,
 						houseId: this.FJValue3.id == undefined ? '' : this.FJValue3.id,
-
+						completionStatus: this.ReviewStatus.dictValue == undefined ? '' : this.ReviewStatus.dictValue,
 						createBy: user.state.name,
 						pageNum: this.pageNum,
 						pageSize: this.pageSize
@@ -1303,6 +1330,10 @@
 						}
 
 					})
+				} else if (this.EngineeringValue == '顶管工程' || this.EngineeringValue == '基建工程' || this.EngineeringValue ==
+					'危险工程' || this.EngineeringValue == '市政工程' || this.EngineeringValue == '工业工程') {
+					//type 1 = 顶管， 2=基建 3=危险 4= 市政 5= 工业
+
 				}
 			},