Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

Lou

2024-01-03 d4fac5f5527828b02642fcc88e31e4f91b4b6786

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

 subPackage/workbench/views/hotelReportDetail.vue

@@ -9,7 +9,7 @@
        <view class="licence" v-if="fireImages.length">
            <box-title title="灭火器图片" class="box-title"></box-title>
            <view class="flex-wrap">
                <view v-for="(i,k) in fireImages" :key="k" class="ml-20 mt-20"   @click="previewImg(i,fireImages)">
                <view v-for="(i,k) in fireImages" :key="k" class="ml-20 mt-20" @click="previewImg(i,fireImages)">
                    <u-image :src="i" width="80" height="80"></u-image>
                </view>
            </view>
@@ -17,7 +17,7 @@
        <view class="planegraph" v-if="scImageUrls.length">
            <box-title title="安全通道图片" class="box-title"></box-title>
            <view class="flex-wrap">
                <view v-for="(i,k) in scImageUrls" :key="k" class="ml-20 mt-20"  @click="previewImg(i,scImageUrls)">
                <view v-for="(i,k) in scImageUrls" :key="k" class="ml-20 mt-20" @click="previewImg(i,scImageUrls)">
                    <u-image :src="i" width="80" height="80"></u-image>
                </view>
            </view>
@@ -25,7 +25,7 @@
        <view class="planegraph" v-if="pfImageUrls.length">
            <box-title title="技防设施图片" class="box-title"></box-title>
            <view class="flex-wrap">
                <view v-for="(i,k) in pfImageUrls" :key="k" class="ml-20 mt-20"  @click="previewImg(i,pfImageUrls)">
                <view v-for="(i,k) in pfImageUrls" :key="k" class="ml-20 mt-20" @click="previewImg(i,pfImageUrls)">
                    <u-image :src="i" width="80" height="80"></u-image>
                </view>
            </view>
@@ -33,7 +33,7 @@
        <view class="planegraph" v-if="uanImageUrls.length">
            <box-title title="未成年人入住及照片" class="box-title"></box-title>
            <view class="flex-wrap">
                <view v-for="(i,k) in uanImageUrls" :key="k" class="ml-20 mt-20"  @click="previewImg(i,uanImageUrls)">
                <view v-for="(i,k) in uanImageUrls" :key="k" class="ml-20 mt-20" @click="previewImg(i,uanImageUrls)">
                    <u-image :src="i" width="80" height="80"></u-image>
                </view>
            </view>
@@ -43,7 +43,7 @@
            <box-title title="审核信息" class="box-title"></box-title>
            <view class="info">
                <u-form labelWidth="70" :model="form" ref="form" class="form">
                    <u-form-item label="审核状态"  @click="showPicker()" class="form-item" :border-bottom="true">
                    <u-form-item label="审核状态" @click="showPicker()" class="form-item" :border-bottom="true">
                        <u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态"
                            :border="false"></u--input>
                        <u-icon slot="right" name="arrow-right"></u-icon>
@@ -184,27 +184,27 @@
                scImageUrls: [],
                pfImageUrls: [],
                uanImageUrls: [],
                selectStatus: "",
                selectStatus: 2,
                remark: "",
                roleType:"",
                status:1,
                id:""
                roleType: "",
                status: 1,
                id: ""
            }
        },
        onLoad(option) {
            this.taskId = option.id;
            this.getDetailInfo(option.id);
            let roleName = uni.getStorageSync("activeRole").roleName
            if(roleName == "居民"){
            if (roleName == "居民") {
                this.roleType = 2
            }else {
            } else {
                this.roleType = 1
            }
        },

        methods: {
            showPicker() {
                if (this.roleType == 1){
                if (this.roleType == 1) {
                    this.isPickerShow = true;
                };
            },
@@ -227,10 +227,11 @@

                })
            },
			
            previewImg(current,urls){

            previewImg(current, urls) {
                uni.previewImage({
                    current,urls
                    current,
                    urls
                })
            },

@@ -242,7 +243,7 @@
            submit() {
                let data = {
                    id: this.id,
                    taskId:this.taskId,
                    taskId: this.taskId,
                    status: this.selectStatus,
                    remark: this.remark
                }
@@ -259,26 +260,26 @@
                            title: '更新失败',
                            icon: 'error'
                        })
						
                    }else {

                    } else {
                        uni.showToast({
                            title: '提交成功',
                            title: '提交成功',
                        })
                        this.reLoadPrePage();
                    }
					

                })
            },
			

            //刷新上一页数据后返回
            reLoadPrePage() {
                let pages = getCurrentPages();
                let prePage = pages[pages.length - 2];
                prePage.$vm.currentPage = 1, 
                prePage.$vm.list = [];
                prePage.$vm.currentPage = 1,
                    prePage.$vm.list = [];
                prePage.$vm.getList();
                uni.navigateBack();
            },	
            },
        }
    }
</script>

 subPackage/workbench/views/labelReportDetail.vue

@@ -1,263 +1,264 @@
<template>
    <view class="container">
        <view class="basic">
            <box-title title="基本信息" class="box-title"></box-title>
            <view class="info">
                <lineItem :dataInfo="basicData"></lineItem>
            </view>
        </view>
        <view class="licence" v-if="imageUrls.length">
            <box-title title="手持身份证" class="box-title"></box-title>
            <view class="flex-wrap">
                <view v-for="(i,k) in imageUrls" :key="k" class="ml-20 mt-20"  @click="previewImg(i,imageUrls)">
                    <u-image :src="i" width="80" height="80" ></u-image>
                </view>
            </view>
        </view>
        <view class="planegraph" v-if="goodsImageUrls.length">
            <box-title title="物品照片" class="box-title"></box-title>
            <view class="flex-wrap">
                <view v-for="(i,k) in goodsImageUrls" :key="k" class="ml-20 mt-20"   @click="previewImg(i,imageUrls)">
                    <u-image :src="i" width="80" height="80"></u-image>
                </view>
            </view>
        </view>
        <view class="examine">
            <box-title title="审核信息" class="box-title"></box-title>
            <view class="info">
                <u-form labelWidth="70" :model="form" ref="form" class="form">
                    <u-form-item label="审核状态"  @click="showPicker()"  class="form-item" :border-bottom="true">
                        <u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态"
                            :border="false"></u--input>
                        <u-icon slot="right" name="arrow-right"></u-icon>
                    </u-form-item>
                    <u-form-item label="备注" class="form-item" v-if="selectStatus == 3">
                        <u--input type="textarea" v-model="remark"></u--input>
                    </u-form-item>
                </u-form>
            </view>
        </view>
        <view class="bottom-btn" v-if="(roleType == 1 && status == 1) || (roleType == 2 && status == 2)">
            <u-button type="primary" @click="submit">提交审核</u-button>
        </view>
        <u-picker :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker"
            :columns="columns" keyName="name" @cancel="isPickerShow = false" @confirm="handleConfirm"></u-picker>
    </view>
    <view class="container">
        <view class="basic">
            <box-title title="基本信息" class="box-title"></box-title>
            <view class="info">
                <lineItem :dataInfo="basicData"></lineItem>
            </view>
        </view>
        <view class="licence" v-if="imageUrls.length">
            <box-title title="手持身份证" class="box-title"></box-title>
            <view class="flex-wrap">
                <view v-for="(i,k) in imageUrls" :key="k" class="ml-20 mt-20" @click="previewImg(i,imageUrls)">
                    <u-image :src="i" width="80" height="80"></u-image>
                </view>
            </view>
        </view>
        <view class="planegraph" v-if="goodsImageUrls.length">
            <box-title title="物品照片" class="box-title"></box-title>
            <view class="flex-wrap">
                <view v-for="(i,k) in goodsImageUrls" :key="k" class="ml-20 mt-20" @click="previewImg(i,imageUrls)">
                    <u-image :src="i" width="80" height="80"></u-image>
                </view>
            </view>
        </view>
        <view class="examine">
            <box-title title="审核信息" class="box-title"></box-title>
            <view class="info">
                <u-form labelWidth="70" :model="form" ref="form" class="form">
                    <u-form-item label="审核状态" @click="showPicker()" class="form-item" :border-bottom="true">
                        <u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态"
                            :border="false"></u--input>
                        <u-icon slot="right" name="arrow-right"></u-icon>
                    </u-form-item>
                    <u-form-item label="备注" class="form-item" v-if="selectStatus == 3">
                        <u--input type="textarea" v-model="remark"></u--input>
                    </u-form-item>
                </u-form>
            </view>
        </view>
        <view class="bottom-btn" v-if="(roleType == 1 && status == 1) || (roleType == 2 && status == 2)">
            <u-button type="primary" @click="submit">提交审核</u-button>
        </view>
        <u-picker :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker"
            :columns="columns" keyName="name" @cancel="isPickerShow = false" @confirm="handleConfirm"></u-picker>
    </view>
</template>
 

<script>
    import boxTitle from "@/subPackage/workbench/components/boxTitle/index.vue"
    import lineItem from '../components/lineItem.vue'
    import {
        getLabelReportingDetail,
        setLabelReporting
    } from '@/api/reporting/reporting'
    export default {
        components: {
            boxTitle,
            lineItem
        },
        data() {
            return {
                basicData: [{
                        label: '对象电话',
                        name: "transactionObjectTel",
                        value: '未完善'
                    },
                    {
                        label: '交易金额',
                        name: 'transactionMoney',
                        value: '未完善'
                    },
                    {
                        label: '物品数量',
                        name: 'goodsNums',
                        value: '未完善'
                    },
                    {
                        label: '交易位置',
                        name: 'localtion',
                        value: '未完善'
                    },
                    {
                        label: '交易过程',
                        name: 'transactionProcess',
                        value: '未完善'
                    }
                ],
                form: {
                    confirmFlag: '待审核',
                    confirmNotion: ''
                },
                isPickerShow: false,
                columns: [
                    [{
                            name: "待审核",
                            status: 1
                        },
                        {
                            name: "审核通过",
                            status: 2
                        },
                        {
                            name: "审核不通过",
                            status: 3
                        },
                    ]
                ],
                currentId: '',
                currentData: {},
                taskId: "",
                imageUrls: [],
                goodsImageUrls: [],
                selectStatus: "",
                remark: "",
                roleType:"",
                status:1,
                id:""
				
            }
        },
        onLoad(option) {
            this.taskId = option.id;
            this.getDetailInfo(option.id);
			
    import boxTitle from "@/subPackage/workbench/components/boxTitle/index.vue"
    import lineItem from '../components/lineItem.vue'
    import {
        getLabelReportingDetail,
        setLabelReporting
    } from '@/api/reporting/reporting'
    export default {
        components: {
            boxTitle,
            lineItem
        },
        data() {
            return {
                basicData: [{
                        label: '对象电话',
                        name: "transactionObjectTel",
                        value: '未完善'
                    },
                    {
                        label: '交易金额',
                        name: 'transactionMoney',
                        value: '未完善'
                    },
                    {
                        label: '物品数量',
                        name: 'goodsNums',
                        value: '未完善'
                    },
                    {
                        label: '交易位置',
                        name: 'localtion',
                        value: '未完善'
                    },
                    {
                        label: '交易过程',
                        name: 'transactionProcess',
                        value: '未完善'
                    }
                ],
                form: {
                    confirmFlag: '待审核',
                    confirmNotion: ''
                },
                isPickerShow: false,
                columns: [
                    [{
                            name: "待审核",
                            status: 1
                        },
                        {
                            name: "审核通过",
                            status: 2
                        },
                        {
                            name: "审核不通过",
                            status: 3
                        },
                    ]
                ],
                currentId: '',
                currentData: {},
                taskId: "",
                imageUrls: [],
                goodsImageUrls: [],
                selectStatus: 2,
                remark: "",
                roleType: "",
                status: 1,
                id: ""

            }
        },
        onLoad(option) {
            this.taskId = option.id;
            this.getDetailInfo(option.id);

            let roleName = uni.getStorageSync("activeRole").roleName
            if(roleName == "居民"){
            if (roleName == "居民") {
                this.roleType = 2
            }else {
            } else {
                this.roleType = 1
            }
			
        },
 
        methods: {
			

        },

        methods: {

            showPicker() {
                if (this.roleType == 1){
                if (this.roleType == 1) {
                    this.isPickerShow = true;
                };
            },
			
            getDetailInfo(id) {
                getLabelReportingDetail({
                    taskId: id
                }).then(res => {
                    console.log(res);
                    let data = res.data;

            getDetailInfo(id) {
                getLabelReportingDetail({
                    taskId: id
                }).then(res => {
                    console.log(res);
                    let data = res.data;
                    this.id = data.id;
                    this.status = res.confirmFlag;
                    this.basicData.forEach(item => {
                        item.value = data[item.name]
                    })
                    // this.imageUrls = this.setImages(data.imageUrls);
                    // this.goodsImageUrls = this.setImages(data.goodsImageUrls);
                    this.basicData.forEach(item => {
                        item.value = data[item.name]
                    })
                    // this.imageUrls = this.setImages(data.imageUrls);
                    // this.goodsImageUrls = this.setImages(data.goodsImageUrls);
                    this.imageUrls = this.$setImageUrl(data.imageUrls);
                    this.goodsImageUrls = this.$setImageUrl(data.goodsImageUrls)
                })
            },
            
            previewImg(current,urls){
                uni.previewImage({
                    current,urls
                })
            },
 
            handleConfirm(e) {
                this.form.confirmFlag = e.value[0].name;
                this.selectStatus = e.value[0].status;
                this.isPickerShow = false
            },
            submit() {
                let data = {
                    id: this.id,
                    taskId:this.taskId,
                    status: this.selectStatus,
                    remark: this.remark
                }
                if (this.selectStatus == 3 && !this.remark) {
                    uni.showToast({
                        title: "请输入拒绝原因",
                        icon: "none"
                    })
                    return;
                }
                setLabelReporting(data).then(res => {
                    if (res.code !== 200) {
                        uni.showToast({
                            title: '更新失败',
                            icon: 'error'
                        })
                    }else {
                           uni.showToast({
                               title: '提交成功',
                           })

            previewImg(current, urls) {
                uni.previewImage({
                    current,
                    urls
                })
            },

            handleConfirm(e) {
                this.form.confirmFlag = e.value[0].name;
                this.selectStatus = e.value[0].status;
                this.isPickerShow = false
            },
            submit() {
                let data = {
                    id: this.id,
                    taskId: this.taskId,
                    status: this.selectStatus,
                    remark: this.remark
                }
                if (this.selectStatus == 3 && !this.remark) {
                    uni.showToast({
                        title: "请输入拒绝原因",
                        icon: "none"
                    })
                    return;
                }
                setLabelReporting(data).then(res => {
                    if (res.code !== 200) {
                        uni.showToast({
                            title: '更新失败',
                            icon: 'error'
                        })
                    } else {
                        uni.showToast({
                            title: '提交成功',
                        })
                        this.reLoadPrePage();
                    }
                    
                })
            },
			
            //刷新上一页数据后返回
            reLoadPrePage() {
                let pages = getCurrentPages();
                let prePage = pages[pages.length - 2];
                prePage.$vm.currentPage = 1, 
                prePage.$vm.list = [];
                prePage.$vm.getList();
                uni.navigateBack();
            },	
			
        }
    }

                })
            },

            //刷新上一页数据后返回
            reLoadPrePage() {
                let pages = getCurrentPages();
                let prePage = pages[pages.length - 2];
                prePage.$vm.currentPage = 1,
                    prePage.$vm.list = [];
                prePage.$vm.getList();
                uni.navigateBack();
            },

        }
    }
</script>
 

<style lang="scss">
    .container {
        padding: 0 20rpx 130rpx;
 
        .box-title {
            margin-bottom: 15rpx;
        }
 
        .info {
            .title {
                font-size: 30rpx;
                padding-left: 10rpx;
            }
 
            .images-box {
                padding: 20rpx;
                min-height: 100rpx;
                background-color: #fff;
            }
        }
 
        .form {
            background-color: #fff;
 
            .form-item {
                padding: 0 20rpx;
 
                &:first-child {
                    border-bottom: 1rpx solid #f6f6ff;
                }
            }
        }
 
        .bottom-btn {
            position: fixed;
            left: 0;
            bottom: 0;
            padding: 20rpx;
            width: calc(100% - 40rpx);
            background-color: #fff;
            z-index: 9999;
        }
    }
 
    /deep/ .u-form-item__body__left__content__label,
    /deep/ .uni-input-placeholder {
        font-size: 30rpx;
    }
</style>
    .container {
        padding: 0 20rpx 130rpx;

        .box-title {
            margin-bottom: 15rpx;
        }

        .info {
            .title {
                font-size: 30rpx;
                padding-left: 10rpx;
            }

            .images-box {
                padding: 20rpx;
                min-height: 100rpx;
                background-color: #fff;
            }
        }

        .form {
            background-color: #fff;

            .form-item {
                padding: 0 20rpx;

                &:first-child {
                    border-bottom: 1rpx solid #f6f6ff;
                }
            }
        }

        .bottom-btn {
            position: fixed;
            left: 0;
            bottom: 0;
            padding: 20rpx;
            width: calc(100% - 40rpx);
            background-color: #fff;
            z-index: 9999;
        }
    }

    /deep/ .u-form-item__body__left__content__label,
    /deep/ .uni-input-placeholder {
        font-size: 30rpx;
    }
</style>