修复部分问题

Lou

2023-12-25 d8243dc134e1be05711dfc08bdf8190a84d0761d

修复部分问题

 subPackage/house/roomDetails/index.vue

@@ -79,6 +79,13 @@
                            <u-icon name="/static/icon/selected.png" size="16"></u-icon>

                            <!-- u-icon name="photo"></u-icon> -->

                            <view class="owner-img-box" v-if="item.relationship == 1">主</view>

                            <view class="ml-20" v-if="item.householdLabelList.length">

                                <block  v-for="i in item.householdLabelList">

                                    <view class="mr-10"  v-if="i.labelName">

                                        <u-tag    :text="i.labelName" plain  size="mini"> </u-tag>

                                    </view>

                                </block>

                            </view>

                        </view>

                        <view class="r">

                            <u-icon name="/static/icon/delete.png" size="16" @click="removeHouseholdSub(item)"></u-icon>

@@ -307,7 +314,6 @@
                this.houseInfo.buildingName = buildingName

                this.houseInfo.addressName = addressName

                if (this.from && this.houseInfo.houseTitle) {

					
                    uni.setNavigationBarTitle({

                        title: `${this.houseInfo.houseTitle}${this.houseInfo.buildingName}${this.houseInfo.unitName}${this.houseInfo.houseName }室`

                    })


 subPackage/workbench/views/audit.vue

@@ -18,7 +18,7 @@
                </view>
                <view class="item-row flex a-i-c j-c-s-b">
                    <text class="f-28">地址</text>
                    <text class="address f-28 c-66">{{i.addressName}}</text>
                    <text class="address f-28 c-66">{{i.addressName || ""}}</text>
                </view>
            </view>
        </view>
@@ -178,6 +178,7 @@

            .address {
                width: 65%;
                text-align: right;
            }
        }
    }

 subPackage/workbench/views/bailReportDetail.vue

@@ -261,14 +261,14 @@
            },

            showPickerDate() {
                if (this.roleType == 2 && this.status != 2) return;
                if (this.roleType == 2 && this.status != 1) return;
                this.showSelectDate = true;
            },
            cancelPickerDate() {
                this.showSelectDate = false;
            },
            showPicker() {
                if (this.roleType == 2 && this.status != 2) return;
                if (this.roleType == 1 && this.status != 2) return;
                this.isPickerShow = true
            },


 subPackage/workbench/views/cscj.vue

@@ -237,7 +237,8 @@
                    username: '',

                    phone: '',

                    lat: '',

                    lng: ''

                    lng: '',

                    location:''

                },

                rules: {

                    // 'buildingCode': {

@@ -762,6 +763,7 @@
                    success: (res) => {

                        this.form.lat = res.latitude;

                        this.form.lng = res.longitude;

                        this.form.laction = res.address;

                        this.form.jwd =

                            `${Number(res.longitude).toFixed(6)},${Number(res.latitude).toFixed(6)}`

                    }


 subPackage/workbench/views/editExamine.vue

@@ -168,7 +168,12 @@
                    for(let i in this.form){

                        if(i === 'imageUrls' || i === 'planImageUrls'){

                            if(this.form[i]){

                                this.form[i] = this.setImageUrl(i,data[i].split('、'))

                                if(data[i]){

                                    this.form[i] = this.setImageUrl(i,data[i].split('、'))

                                }else {

                                    this.form[i] = []

                                }

								
                            }

                        }else{

                            this.form[i]  = data[i]


 subPackage/workbench/views/examine.vue

@@ -66,7 +66,7 @@
        </view> -->

        

        

        <footer-btn  @click="submit"   text="提交审核" />

        <footer-btn  @click="submit"  v-if="form.confirmFlag == 1"   text="提交审核" />

        

        <u-picker :defaultIndex="[this.defaultColumns]" :closeOnClickOverlay="true" @close="isPickerShow = false"

            :show="isPickerShow" ref="uPicker" :columns="columns" keyName="name" @cancel="isPickerShow = false"

@@ -174,6 +174,9 @@
                // Object.keys(this.imageObj).forEach(key => {

                //     this.imageObj[key] = data[key]

                // })

				
                this.form.confirmFlag = data.confirmFlag;	
				
                if(data.imageUrls){

                    // let urls = data.imageUrls.split(",");

                    // this.imageObj.imageUrls = `${minioBaseUrl}${data.imageUrls}`


 subPackage/workbench/views/hotelReportDetail.vue

@@ -185,19 +185,27 @@
                pfImageUrls: [],
                uanImageUrls: [],
                selectStatus: "",
                remark: ""

                remark: "",
                roleType:"",
                status:1
            }
        },
        onLoad(option) {
            this.id = option.id;
            this.getDetailInfo(option.id);
            let roleName = uni.getStorageSync("activeRole").roleName
            if(roleName == "居民"){
                this.roleType = 2
            }else {
                this.roleType = 1
            }
        },

        methods: {
            showPicker() {
                if (this.roleType == 2 && this.status != 2) return;
                this.isPickerShow = true;
                if (this.roleType == 1){
                    this.isPickerShow = true;
                };
            },

            getDetailInfo(id) {
@@ -209,6 +217,7 @@
                    this.basicData.forEach(item => {
                        item.value = data[item.name]
                    })
                    this.status = data.confirmFlag;
                    this.fireImages = this.$setImageUrl(data.fireImageUrls);
                    this.scImageUrls = this.$setImageUrl(data.scImageUrls);
                    this.pfImageUrls = this.$setImageUrl(data.pfImageUrls);

 subPackage/workbench/views/labelReportDetail.vue

@@ -111,19 +111,30 @@
                imageUrls: [],
                goodsImageUrls: [],
                selectStatus: "",
                remark: ""
                remark: "",
                roleType:"",
                status:1
            }
        },
        onLoad(option) {
            this.id = option.id;
            this.getDetailInfo(option.id);
			
            let roleName = uni.getStorageSync("activeRole").roleName
            if(roleName == "居民"){
                this.roleType = 2
            }else {
                this.roleType = 1
            }
			
        },
 
        methods: {
            
            showPickerDate() {
                if (this.roleType == 2 && this.status != 2) return;
                this.isPickerShow = true;
            showPicker() {
                if (this.roleType == 1){
                    this.isPickerShow = true;
                };
            },
            
            getDetailInfo(id) {
@@ -132,6 +143,7 @@
                }).then(res => {
                    console.log(res);
                    let data = res.data;
                    this.status = res.confirmFlag;
                    this.basicData.forEach(item => {
                        item.value = data[item.name]
                    })

 subPackage/workbench/views/schoolReportDetail.vue

@@ -165,12 +165,20 @@
                antiCollisionImageUrls: [], //防撞装置照片
                haImageUrls: [], //高空抛物监控照片
                selectStatus: "",
                remark: ""
                remark: "",
                roleType:"",
                status:1
            }
        },
        onLoad(option) {
            this.id = option.id;
            this.getDetailInfo(option.id);
            let roleName = uni.getStorageSync("activeRole").roleName
            if(roleName == "居民"){
                this.roleType = 2
            }else {
                this.roleType = 1
            }
        },

        methods: {
@@ -183,6 +191,7 @@
                    this.basicData.forEach(item => {
                        item.value = data[item.name] || "未完善"
                    })
                    this.status = data.confirmFlag;
                    this.foImageUrls = this.$setImageUrl(data.foImageUrls);
                    this.fireFacsImageUrls = this.$setImageUrl(data.fireFacsImageUrls);
                    this.patrolImageUrls = this.$setImageUrl(data.patrolImageUrls);