zhnghongrui 1 jaar geleden
bovenliggende
commit
0da25f99cf
5 gewijzigde bestanden met toevoegingen van 44 en 27 verwijderingen
  1. 10 1
      api/common.js
  2. 2 2
      config.js
  3. 27 19
      pages/piping_record/piping_record.vue
  4. 1 1
      pages/statistics/statistics.vue
  5. 4 4
      pages/work/index.vue

+ 10 - 1
api/common.js

@@ -1,5 +1,14 @@
 import request from '@/utils/request'
 
+
+// 未安装新增
+export function AddNotInstalled(param) {
+	return request({
+		'url': '/zdsz/enginNotInstalled',
+		'method': 'post',
+		'data': param
+	})
+}
 // 修改历史
 export function putHistory(param) {
 	return request({
@@ -17,7 +26,7 @@ export function getHistoryDetails(id, name) {
 	})
 }
 //  通过身份查询历史 
-export function gethistoryList( createBy, pageNum, pageSize) {
+export function gethistoryList(createBy, pageNum, pageSize) {
 	//let enginClassification = 'indoor_engin';
 	let enginCycle = '0';
 	const data = {

+ 2 - 2
config.js

@@ -1,8 +1,8 @@
 // 应用全局配置
 module.exports = {
-	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
+	baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
 	// baseUrl: 'http://192.168.4.6:8080',
-	baseUrl: 'http://192.168.4.23:8080',
+	// baseUrl: 'http://192.168.4.23:8080',
 	//baseUrl: 'http://192.168.4.11:8080',
 	// baseUrl: 'http://192.168.4.14:8089',
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',

+ 27 - 19
pages/piping_record/piping_record.vue

@@ -162,13 +162,13 @@
 						<view>
 							原因
 						</view>
-						<view v-if="this.isEmpty(this.reasonValue.id)" style="margin-top: 10;"
+						<view v-if="this.isEmpty(this.reasonValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('reason')">
 							<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('reason')">
-							<span style="color: black;">{{reasonValue.name}}</span>
+							<span style="color: black;">{{reasonValue.dictLabel}}</span>
 							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 						</view>
 
@@ -216,7 +216,7 @@
 			getAreaList,
 			getBuildingList,
 			getUnitList,
-			addTearOldPipe,
+			AddNotInstalled,
 			getRoomProjectList,
 			getRoomProjectId,
 			getHousesList,
@@ -273,7 +273,7 @@
 
 					this.objValue = JSON.parse(decodeURIComponent(options.params));
 
-					
+
 					uni.setNavigationBarTitle({
 						title: '未安装'
 					})
@@ -316,7 +316,7 @@
 						this.$modal.msg("请选择房间")
 						return;
 					}
-					if (this.isEmpty(this.reasonValue.id)) {
+					if (this.isEmpty(this.reasonValue.dictValue)) {
 						this.$modal.msg("请选择原因")
 						return;
 					}
@@ -326,25 +326,24 @@
 					}
 					uni.showLoading()
 					let param = {
+
+
 						district: this.XZQValue.dictValue,
 						areaId: this.XQValue.id,
+						areaName: this.XQValue.name,
+						buildingName: this.LDValue.name,
 						buildingId: this.LDValue.id,
-						unitId: this.isEmpty(this.DYValue.id) ? '' : this.DYValue.id,
-						enginType: this.objValue.enginType, //写死 上一页面传过来的 
-						enginClassification: this.objValue
-							.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
-						enginCycle: this.projectValue.dictValue, //工程周期
-						zEngineeringNodeBo: {
-							type: this.objValue.enginClassValue, //写死 上一页面传过来的  (拆旧管等 字典值)
-							zEngineeringInfoBo: {
-								constructTime: this.time,
-								zEngiineeringPhotoBoList: this.imgArr, //照片集合
-							}
-						}
+						houseId: this.FJValue.id,
+						houseName: this.FJValue.name,
+						unitId: this.DYValue.id,
+						unitName: this.DYValue.name,
+						type: this.reasonValue.dictValue,
+						remark: this.specificReasonsValue,
+
 
 					}
 
-					addTearOldPipe(param).then(res => {
+					AddNotInstalled(param).then(res => {
 						uni.hideLoading()
 						if (res.code == '200') {
 							uni.showToast({
@@ -359,7 +358,6 @@
 
 						}
 					})
-					//提交接口执行逻辑
 
 				},
 
@@ -414,6 +412,11 @@
 							this.open = true;
 							this.selectList = this.FJList;
 						}
+					} else if (e == 'reason') {
+						this.openDict = true;
+						getDicts("not_installed_type").then(response => {
+							this.dictOptions = response.data;
+						});
 					}
 
 				},
@@ -426,9 +429,12 @@
 						this.XQValue = ''; //重置小区数据
 						this.LDValue = ''; //重置楼栋数据
 						this.DYValue = ''; //重置单元数据
+						this.FJValue = '';
 						getAreaList(item.dictValue).then(res => {
 							this.XQList = res.data;
 						})
+					} else if (this.type == 'reason') {
+						this.reasonValue = item;
 					}
 
 				},
@@ -440,6 +446,7 @@
 						//根据小区id 获取楼栋数据
 						this.LDValue = ''; //重置楼栋数据
 						this.DYValue = ''; //重置单元数据
+						this.FJValue = '';
 						this.administrative = item.administrative;
 						getBuildingList(item.id).then(res => {
 							this.LDList = res.data
@@ -448,6 +455,7 @@
 						this.LDValue = item;
 						//根据楼栋ID 获取单元数据
 						this.DYValue = ''; //重置单元数据
+						this.FJValue = '';
 						getUnitList(item.id).then(res => {
 							this.DYList = res.data
 						})

+ 1 - 1
pages/statistics/statistics.vue

@@ -249,7 +249,7 @@
 						<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 in item.nodeReViewStateList"
+						<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>

+ 4 - 4
pages/work/index.vue

@@ -44,7 +44,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 							</image>
 							<image :src="loadImgSrc('dt.png')" class="line2-btn-big" v-if="item.dictLabel == '底腿'">
 							</image>
-							<image :src="loadImgSrc('gd.png')" class="line2-btn-big" v-if="item.dictLabel == '管道施工记录'">
+							<image :src="loadImgSrc('gd.png')" class="line2-btn-big" v-if="item.dictLabel == '未安装'">
 							</image>
 							{{item.dictLabel}}
 						</view>
@@ -71,7 +71,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 							</image>
 							<image :src="loadImgSrc('dt2.png')" class="line2-btn-big" v-if="item.dictLabel == '底腿'">
 							</image>
-							<image :src="loadImgSrc('gd2.png')" class="line2-btn-big" v-if="item.dictLabel == '管道施工记录'">
+							<image :src="loadImgSrc('gd2.png')" class="line2-btn-big" v-if="item.dictLabel == '未安装'">
 							</image>
 							{{item.dictLabel}}
 						</view>
@@ -274,7 +274,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 								obj))
 					})
 
-				} else if (e.dictValue == 'construction_records') {
+				} else if (e.dictValue == 'not_installed') {
 					//新建管道施工记录
 					const obj = {
 						enginClassValue: this.enginClassValue, //(拆旧管等 字典值)
@@ -332,7 +332,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 								obj))
 					})
 
-				} else if (e.dictValue == 'construction_records') {
+				} else if (e.dictValue == 'not_installed') {
 					//旧改管道施工记录
 					const obj = {
 						enginClassValue: this.enginClassValue, //(拆旧管等 字典值)