|
|
@@ -83,29 +83,99 @@
|
|
|
<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
+
|
|
|
+
|
|
|
+ <view v-for="(user,index) in currentResidentsPhoe" :key="index" class="num-style">
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
+ <spane>现住人电话</spane>
|
|
|
+ <view style="display: flex; justify-content: flex-end; ">
|
|
|
+ <input class="uni-input" type="tel" v-model="user.phone" maxlength="11"
|
|
|
+ style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx; "></input>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <button v-if="index!=0" @click="this.currentResidentsPhoe.splice(index,1)"
|
|
|
+ class="sc-btn">删除</button>
|
|
|
+ </view>
|
|
|
+ <button @click="this.currentResidentsPhoe.push({phone:''})" class="tj-btn">添加</button>
|
|
|
+
|
|
|
</view>
|
|
|
- <!-- <view class="container" style="">
|
|
|
+ </view>
|
|
|
+
|
|
|
+
|
|
|
+ <SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
|
|
|
+ subtitleKey="id" v-model="name"></SelectPicker>
|
|
|
+
|
|
|
+
|
|
|
+ <SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
|
|
|
+ titleKey="dictLabel" subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="background">
|
|
|
|
|
|
- <view class="title">是否按照施工图纸施工</view>
|
|
|
- <span style="color: black;">{{this.form}}</span>
|
|
|
- <switch style="transform: scale(0.6,0.6);" @change="switchChange" checked="isChick" />
|
|
|
|
|
|
- </view> -->
|
|
|
+ <view>
|
|
|
|
|
|
- <SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
|
|
|
- subtitleKey="id" v-model="name"></SelectPicker>
|
|
|
+ <view
|
|
|
+ style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
|
|
|
+ 户主信息
|
|
|
|
|
|
+ <image v-if="change==false" src="../../../static/images/icon_open.png" @click='change1'
|
|
|
+ style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
|
|
|
+ </image>
|
|
|
+ <image v-if="change==true" src="../../../static/images/icon_close.png" @click='change1'
|
|
|
+ style="display: flex;justify-content:flex-end; margin-right: 10px;width: 15px;height: 15px;">
|
|
|
+ </image>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view v-show="change">
|
|
|
+ <view class="uni-list">
|
|
|
+ <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
+ <view class="uni-list-cell-left">
|
|
|
+ 户主姓名
|
|
|
+ </view>
|
|
|
+ <view class="uni-list-cell-db" style="margin-top: 10;">
|
|
|
+ <span style="color: darkgray;" v-model="houseHeadName">{{houseHeadName}}</span>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="uni-list">
|
|
|
+ <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
+ <view class="uni-list-cell-left">
|
|
|
+ 户主电话
|
|
|
+ </view>
|
|
|
+ <view class="uni-list-cell-db" style="margin-top: 10;">
|
|
|
+ <span style="color: darkgray;" v-model="houseHeadPhone">{{houseHeadPhone}}</span>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="uni-list">
|
|
|
+ <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
+ <view class="uni-list-cell-left">
|
|
|
+ 户主身份证号码
|
|
|
+ </view>
|
|
|
+ <view class="uni-list-cell-db" style="margin-top: 10;">
|
|
|
+ <span style="color: darkgray;"
|
|
|
+ v-model="houseHeadIDcardNumber">{{houseHeadIDcardNumber}}</span>
|
|
|
+ </view>
|
|
|
|
|
|
- <SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
|
|
|
- titleKey="dictLabel" subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<!--报警器切断阀-->
|
|
|
<view class="background">
|
|
|
- <view v-if="objValue.enginClassValue=='报警器切断阀'">
|
|
|
+ <view v-if="objValue.enginClassValue=='报警器'||objValue.enginClassValue=='切断阀'">
|
|
|
<view class="uni-list">
|
|
|
<view
|
|
|
style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between; margin-bottom: 10px;">
|
|
|
- 报警器切断阀
|
|
|
+ {{objValue.enginClassValue}}
|
|
|
|
|
|
<span
|
|
|
style="color: blue;font-size: 14px; display: flex;justify-content:flex-end; margin-right: 10px;"
|
|
|
@@ -231,11 +301,11 @@
|
|
|
<text>米 数</text>
|
|
|
<!-- style="margin-left: 10px;text-align: right;" -->
|
|
|
<view style="display: flex; justify-content: right; width: 70%;">
|
|
|
- <input class="uni-input" type="number" v-model="inputIntegerNumberValue" 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" v-model="inputDecimalNumberValue" maxlength="1"
|
|
|
- style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
|
|
|
+ <input class="uni-input" type="number" v-model="inputIntegerNumberValue" 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" v-model="inputDecimalNumberValue" maxlength="1"
|
|
|
+ style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -315,13 +385,13 @@
|
|
|
<text>米 数</text>
|
|
|
<!-- style="margin-left: 10px;text-align: right;" -->
|
|
|
<view style="display: flex; justify-content: right; width: 70%;">
|
|
|
- <input class="uni-input" type="number" v-model="inputIntegerNumberValue" 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" v-model="inputDecimalNumberValue" maxlength="1"
|
|
|
- style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
|
|
|
+ <input class="uni-input" type="number" v-model="inputIntegerNumberValue" 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" v-model="inputDecimalNumberValue" maxlength="1"
|
|
|
+ style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
|
|
|
</view>
|
|
|
-
|
|
|
+
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -354,11 +424,11 @@
|
|
|
<view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
|
|
|
<view>
|
|
|
- 自闭阀类型
|
|
|
+ 自闭阀厂家
|
|
|
</view>
|
|
|
<view v-if="this.isEmpty(this.SelfClosValve.dictValue)" style="margin-top: 10;"
|
|
|
@click="pickerShow('zbf')">
|
|
|
- <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('zbf')">
|
|
|
@@ -369,11 +439,11 @@
|
|
|
<view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
|
|
|
<view>
|
|
|
- 材 质
|
|
|
+ 灶具管厂家
|
|
|
</view>
|
|
|
<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;"
|
|
|
@click="pickerShow('cz')">
|
|
|
- <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('cz')">
|
|
|
@@ -396,17 +466,16 @@
|
|
|
<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
+ <!-- <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
<text>米 数</text>
|
|
|
- <!-- style="margin-left: 10px;text-align: right;" -->
|
|
|
<view style="display: flex; justify-content: right; width: 70%;">
|
|
|
- <input class="uni-input" type="number" v-model="inputIntegerNumberValue" 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" v-model="inputDecimalNumberValue" maxlength="1"
|
|
|
- style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
|
|
|
+ <input class="uni-input" type="number" v-model="inputIntegerNumberValue" 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" v-model="inputDecimalNumberValue" maxlength="1"
|
|
|
+ style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
|
|
|
@@ -481,7 +550,11 @@
|
|
|
headers: {
|
|
|
Authorization: "Bearer " + getToken()
|
|
|
},
|
|
|
+ houseHeadName: '',
|
|
|
+ houseHeadPhone: '',
|
|
|
+ houseHeadIDcardNumber: '',
|
|
|
type: '',
|
|
|
+ change: false,
|
|
|
open: false,
|
|
|
reviewStatus: '', //是否可以点击
|
|
|
objValue: '', //上一页面传过来的值 新增接口用
|
|
|
@@ -494,6 +567,9 @@
|
|
|
projectValue: {
|
|
|
'dictValue': '0'
|
|
|
},
|
|
|
+ currentResidentsPhoe: [{
|
|
|
+ phone: ''
|
|
|
+ }],
|
|
|
LevelValue: {},
|
|
|
LDValue: {},
|
|
|
DYValue: {},
|
|
|
@@ -552,6 +628,10 @@
|
|
|
|
|
|
},
|
|
|
|
|
|
+ change1() {
|
|
|
+ this.change = !this.change
|
|
|
+ },
|
|
|
+
|
|
|
// 显示历史弹窗
|
|
|
handleShowSheet() {
|
|
|
this.shareState = true;
|
|
|
@@ -729,8 +809,11 @@
|
|
|
|
|
|
} else if (e == 'gg') { //规格
|
|
|
if (this.isEmpty(this.materialValue.id)) {
|
|
|
- this.$modal.msg('请选择材质')
|
|
|
-
|
|
|
+ if (this.objValue.enginClassValue == '阀管') {
|
|
|
+ this.$modal.msg('请选择灶具管厂家')
|
|
|
+ } else {
|
|
|
+ this.$modal.msg('请选择材质')
|
|
|
+ }
|
|
|
} else {
|
|
|
this.open = true;
|
|
|
this.selectList = this.materialList;
|
|
|
@@ -802,6 +885,7 @@
|
|
|
|
|
|
} else {
|
|
|
this.open = true;
|
|
|
+
|
|
|
this.selectList = this.FJList;
|
|
|
}
|
|
|
}
|
|
|
@@ -861,6 +945,9 @@
|
|
|
})
|
|
|
} else if (this.type == 'gg') {
|
|
|
this.specificationValue = item;
|
|
|
+ var onlyNumbers = item.name.replace(/[^\d.]/g, '');
|
|
|
+
|
|
|
+ console.log(onlyNumbers); // 输出: "123456"
|
|
|
|
|
|
} else if (this.type == 'xq') {
|
|
|
this.XQValue = item;
|
|
|
@@ -888,7 +975,9 @@
|
|
|
})
|
|
|
} else if (this.type == 'fj') {
|
|
|
this.FJValue = item;
|
|
|
-
|
|
|
+ this.houseHeadName = 'dda';
|
|
|
+ this.houseHeadPhone = '125';
|
|
|
+ this.houseHeadIDcardNumber = '335';
|
|
|
if (!this.isEmpty(this.projectValue.dictValue)) {
|
|
|
|
|
|
//房间选完 判断 工程周期
|
|
|
@@ -951,17 +1040,40 @@
|
|
|
|
|
|
if (this.isEmpty(this.projectValue.dictValue)) {
|
|
|
this.$modal.msg("请选择工程周期")
|
|
|
- } else if (this.isEmpty(this.XZQValue.dictValue)) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (this.isEmpty(this.XZQValue.dictValue)) {
|
|
|
this.$modal.msg("请选择行政区")
|
|
|
- } else if (this.isEmpty(this.XQValue.id)) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (this.isEmpty(this.XQValue.id)) {
|
|
|
this.$modal.msg("请选择小区")
|
|
|
- } else if (this.isEmpty(this.LDValue.id)) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (this.isEmpty(this.LDValue.id)) {
|
|
|
this.$modal.msg("请选择楼栋")
|
|
|
- } else if (this.isEmpty(this.DYValue.id)) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (this.isEmpty(this.DYValue.id)) {
|
|
|
this.$modal.msg("请选择单元")
|
|
|
- } else if (this.isEmpty(this.FJValue.id)) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (this.isEmpty(this.FJValue.id)) {
|
|
|
this.$modal.msg("请选择房间")
|
|
|
- } else if (this.objValue.enginClassValue == '报警器切断阀') {
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ try {
|
|
|
+ this.currentResidentsPhoe.forEach((list) => {
|
|
|
+ if (this.isEmpty(list.phone)) {
|
|
|
+ this.$modal.msg('现住人电话不能为空')
|
|
|
+ throw new Error('End Loop')
|
|
|
+ }
|
|
|
+ })
|
|
|
+ } catch (e) {
|
|
|
+ if (e.message === 'End Loop') throw e
|
|
|
+ }
|
|
|
+ if (this.objValue.enginClassValue == '报警器' || this.objValue.enginClassValue == '切断阀') {
|
|
|
if (this.isEmpty(this.brandValue.dictValue)) {
|
|
|
this.$modal.msg("请选择厂家")
|
|
|
} else {
|
|
|
@@ -1079,7 +1191,7 @@
|
|
|
if (this.isEmpty(this.doorValue.dictValue)) {
|
|
|
this.$modal.msg("请选择上门类型")
|
|
|
} else if (this.isEmpty(this.SelfClosValve.dictValue)) {
|
|
|
- this.$modal.msg("请选择自闭阀类型")
|
|
|
+ this.$modal.msg("请选择自闭阀厂家")
|
|
|
} else if (this.isEmpty(this.materialValue.id)) {
|
|
|
this.$modal.msg("请选择材质")
|
|
|
} else if (this.isEmpty(this.specificationValue.id)) {
|
|
|
@@ -1134,7 +1246,8 @@
|
|
|
|
|
|
}
|
|
|
//this.onsubmit(param)
|
|
|
- } else if (this.objValue.enginClassValue == '报警器切断阀') { //报警器切断阀
|
|
|
+ } else if (this.objValue.enginClassValue == '报警器' || this.objValue.enginClassValue ==
|
|
|
+ '切断阀') { //报警器切断阀
|
|
|
param = {
|
|
|
district: this.XZQValue.dictValue,
|
|
|
areaId: this.XQValue.id,
|
zhnghongrui
