Merge remote-tracking branch 'origin/master'

linwe

2023-11-11 e144b1e91c4926efd99ef4d62029e3eda67fd72d

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	subPackage/workbench/views/editExamine.vue

 pages.json

@@ -237,7 +237,7 @@
                {
                    "path": "views/editExamine",
                    "style": {
                        "navigationBarTitleText": "场合维护",
                        "navigationBarTitleText": "场所维护",
                        "enablePullDownRefresh": false,
                        "navigationBarBackgroundColor": "#fff",
                        "navigationBarTextStyle": "black"

 pages/home/index.vue

@@ -158,7 +158,7 @@
                                    <text class="f-24 c-99 ml-10">{{item.countNumber}}</text>

                                </view> -->

                                <view class="flex a-i-c">

                                    <u-icon name="eye-fill" size="22" color="#CECECE"></u-icon>

                                    <u-icon name="eye-fill" size="20" color="#CECECE"></u-icon>

                                    <text class="f-24 c-99 ml-10">{{item.viewNumber}}</text>

                                </view>

                            </view>


 subPackage/article/list.vue

@@ -1,29 +1,30 @@
<template>
    <view class="">
        <view class="tab">
            <u-tabs :list="tabList"   :current="tabIndex" keyName="dictValue"   @change="changeTab"  :inactiveStyle="{color:'#999999'}"  :activeStyle="{color:'#017BFC'}"></u-tabs>
            <u-tabs :list="tabList" :current="tabIndex" keyName="dictValue" @change="changeTab"
                :inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs>
        </view>
    <view v-for="(item,index) in noticeList" :key="index"  class="list">
        <view class="notic-list bgc-ff"   @click="navTo(item.id)">
            <view class="f-28 mb-30">
                {{item.title}}
            </view>
            <view class="flex a-i-c j-c-s-b">
                <view class="f-28 flex a-i-c">
                    <!-- <view class="flex a-i-c mr-30">
        <view class="list">
            <view class="notic-list bgc-ff" v-for="(item,index) in noticeList" key="index" @click="navTo(item.id)">
                <view class="f-28 mb-30">
                    {{item.title}}
                </view>
                <view class="flex a-i-c j-c-s-b">
                    <view class="f-28 flex a-i-c">
                        <!-- <view class="flex a-i-c mr-30">
                        <u-icon name="thumb-up-fill" size="24" color="#CECECE"></u-icon>
                        <text class="f-24 c-99 ml-10">{{item.countNumber}}</text>
                    </view> -->
                    <view class="flex a-i-c">
                        <u-icon name="eye-fill" size="22" color="#CECECE"></u-icon>
                        <text class="f-24 c-99 ml-10">{{item.viewNumber}}</text>
                        <view class="flex a-i-c">
                            <u-icon name="eye-fill" size="20" color="#CECECE"></u-icon>
                            <text class="f-24 c-99 ml-10">{{item.viewNumber}}</text>
                        </view>
                    </view>
                    <text class="f-24 c-99">{{item.createTime}}</text>
                </view>
                <text class="f-24 c-99">{{item.createTime}}</text>
            </view>
            <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
        </view>
    </view>
    <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
    </view>
</template>

@@ -33,52 +34,57 @@
        getCategory
    } from "@/api/article/article.js";
    export default {
        data(){
        data() {
            return {
                tabList:[],
                tabId:"",
                tabIndex:0,
                tabList: [],
                tabId: "",
                tabIndex: 0,
                noticeList: [],
                currentPage:1,
                currentPage: 1,
                loadingStatus: 'nomore'
            }
        },
        onLoad() {
            this.getCateList()
			

        },
        onReachBottom() {
            this.currentPage++
            this.getPageList()
        },
				
        methods:{
			
            changeTab(e){

        methods: {

            changeTab(e) {
                this.tabIndex = e.index;
                this.tabId = e.dictKey;
                this.noticeList = [];
                this.currentPage = 1;
                this.getNoticeList()
            },
			
            getCateList(){

            getCateList() {
                getCategory({
                    parentId:'1722966265111248897'
                }).then(res=>{
                    parentId: '1722966265111248897'
                }).then(res => {
                    console.log(res)
                    this.tabList = res.data;
                    this.tabId = res.data[0].dictKey;
                    let data = res.data;
                    data.unshift({
                        dictKey: "",
                        dictValue: "全部"
                    })
                    this.tabList = data;
                    // this.tabId = data[0].dictKey;
                    this.getNoticeList()
                })
            },
			

            async getNoticeList() {
                this.loadingStatus = 'loadingmore'
                const param = {
                    size: 10,
                    current: this.currentPage,
                    articleType:this.tabId
                    articleType: this.tabId
                }
                const res = await getPage(param)
                const {
@@ -96,9 +102,9 @@
                }
                this.noticeList = [...this.noticeList, ...records]
                this.loadingStatus = 'nomore'
			

            },
            navTo(id){
            navTo(id) {
                this.$u.func.globalNavigator(`detail?id=${id}`, "navTo")
            }
        }
@@ -106,29 +112,32 @@
</script>

<style>
    page{
        background-color:#f5f5f5;
    page {
        background-color: #f5f5f5;
    }
    .tab{
        width:100%;
        height:88rpx;
        position:fixed;

    .tab {
        width: 100%;
        height: 88rpx;
        position: fixed;
        /*#ifdef H5*/
        top:88rpx;
        top: 88rpx;
        /*#endif*/
         /*#ifdef MP-WEIXIN*/
        top:0;
        /*#ifdef MP-WEIXIN*/
        top: 0;
        /*#endif*/
        left:0;
        background-color:#fff;
        padding:0 30rpx;
        left: 0;
        background-color: #fff;
        padding: 0 30rpx;
        box-sizing: border-box;
        z-index: 999;
		

    }
    .list{
        margin-top:108rpx;

    .list {
        margin-top: 108rpx;
    }

    .notic-list {
        padding: 30rpx;
        border-bottom: 1px solid #f5f5f5;

 subPackage/label/bail.vue

@@ -42,7 +42,7 @@
            </view>
        </u-form>
        <button class="submit-btn" @click="sumitInfo">提交</button>
        <button class="list-btn" @click="navigatorPage">我上报的事件</button>
        <button class="list-btn mb-20" @click="navigatorPage">我上报的事件</button>
         <u-datetime-picker ref="datetimePicker" :show="showSelectDate" v-model="applyTime" mode="datetime"
             :formatter="formatter" @confirm="confirmDate"  @cancel="showSelectDate = false"></u-datetime-picker>
    </view>

 subPackage/label/bailList.vue

@@ -1,75 +1,97 @@
<template>
    <view class="">
             <view class="list">
                 <view class="list-item bgc-ff mb-20"  v-for="(i,k) in list"  :key="k"  @click="navTo(i.taskId)">
                     <view class="item-title flex a-i-c j-c-s-b mb-20">
                         <text class="f-32 fw">{{i.checkUserName}}</text>
                         <u-tag v-if="i.confirmFlag == 1" text="待审批" type="warning" plain plainFill></u-tag>
                         <u-tag v-if="i.confirmFlag == 2" text="审核通过" type="success" plain plainFill></u-tag>
                         <u-tag v-if="i.confirmFlag == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
                     </view>
                     <view class="item-row flex a-i-c j-c-s-b">
                         <text class="f-28">时间</text>
                         <text class="f-28 c-66">{{i.createTime}}</text>
                     </view>
                 </view>
             </view>	
        <view class="list">
            <view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k" @click="navTo(i.taskId)">
                <view class="item-title flex a-i-c j-c-s-b mb-20">
                    <text class="f-32 fw">{{i.checkUserName}}</text>
                    <u-tag v-if="i.confirmFlag == 1" text="待审批" type="warning" plain plainFill></u-tag>
                    <u-tag v-if="i.confirmFlag == 2" text="审核通过" type="success" plain plainFill></u-tag>
                    <u-tag v-if="i.confirmFlag == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
                </view>
                <view class="item-row flex a-i-c j-c-s-b">
                    <text class="f-28">时间</text>
                    <text class="f-28 c-66">{{i.applyTime}}</text>
                </view>
            </view>
        </view>
        <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
    </view>
</template>

<script>
    import {getBailReportingList} from "@/api/reporting/reporting.js"
    import {
        getBailReportingList
    } from "@/api/reporting/reporting.js"
    export default {
        data(){
        data() {
            return {
                list:[]
                list: [],
                currentPage: 1,
                loadingStatus: 'nomore',
            }
        },
		
        onLoad(){

        onLoad() {
            this.getList()
        },
		
        methods:{
            getList(){
        onReachBottom() {
            this.currentPage++
            this.getPageList()
        },

        methods: {
            getList() {
                getBailReportingList({
                    checkUserId:uni.getStorageSync("userInfo").user_id,
                    page:1,
                    size:20
                }).then(res=>{
                    console.log(res)
                    this.list = res.data.records;
                    checkUserId: uni.getStorageSync("userInfo").user_id,
                    page: this.currentPage,
                    size: 10
                }).then(res => {
                    if (res.code != 200) {
                        uni.showToast({
                            title: '数据请求失败',
                            icon: 'error'
                        })
                        return
                    }
                    let records = res.data.records;
                    this.list = [...this.list, ...records]
                    this.loadingStatus = 'nomore'
                })
            },
			
            navTo(id){

            navTo(id) {
                uni.navigateTo({
                    url:`/subPackage/workbench/views/bailReportDetail?id=${id}`
                    url: `/subPackage/workbench/views/bailReportDetail?id=${id}`
                })
            }
			

        }
    }
</script>

<style lang="scss">
    page{
        background-color:#F5F5F5;
    page {
        background-color: #F5F5F5;
    }
    .list{
        margin:20rpx 30rpx 0;

    .list {
        margin: 20rpx 30rpx 0;
    }
    .list-item{
        padding:0 30rpx 20rpx;

    .list-item {
        padding: 0 30rpx 20rpx;
        border-radius: 8rpx;
        .item-title{
            padding:30rpx 0;
            border-bottom:1px solid #F5F5F5;

        .item-title {
            padding: 30rpx 0;
            border-bottom: 1px solid #F5F5F5;
        }
        .item-row{
            padding:10rpx 0;
            .address{
                width:65%;

        .item-row {
            padding: 10rpx 0;

            .address {
                width: 65%;
            }
        }
    }

 subPackage/label/formList.vue

@@ -1,52 +1,69 @@
<template>
    <view class="">
             <view class="list">
                 <view class="list-item bgc-ff mb-20"  v-for="(i,k) in list"  :key="k"  @click="navTo(i.taskId)">
                     <view class="item-title flex a-i-c j-c-s-b mb-20">
                         <text class="f-32 fw"  v-if="i.eventType == 1">打金店</text>
                        <text class="f-32 fw"  v-if="i.eventType == 3">二手车交易</text>
                        <text class="f-32 fw"  v-if="i.eventType == 2">二手手机维修</text>
                         <u-tag v-if="i.confirmFlag == 1" text="待审批" type="warning" plain plainFill></u-tag>
                         <u-tag v-if="i.confirmFlag == 2" text="审核通过" type="success" plain plainFill></u-tag>
                         <u-tag v-if="i.confirmFlag == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
                     </view>
                     <view class="item-row flex a-i-c j-c-s-b">
                         <text class="f-28">时间</text>
                         <text class="f-28 c-66">{{i.createTime}}</text>
                     </view>
                 </view>
             </view>	
        <view class="list">
            <view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k" @click="navTo(i.taskId)">
                <view class="item-title flex a-i-c j-c-s-b mb-20">
                    <text class="f-32 fw" v-if="i.eventType == 1">打金店</text>
                    <text class="f-32 fw" v-if="i.eventType == 3">二手车交易</text>
                    <text class="f-32 fw" v-if="i.eventType == 2">二手手机维修</text>
                    <u-tag v-if="i.confirmFlag == 1" text="待审批" type="warning" plain plainFill></u-tag>
                    <u-tag v-if="i.confirmFlag == 2" text="审核通过" type="success" plain plainFill></u-tag>
                    <u-tag v-if="i.confirmFlag == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
                </view>
                <view class="item-row flex a-i-c j-c-s-b">
                    <text class="f-28">时间</text>
                    <text class="f-28 c-66">{{i.applyTime}}</text>
                </view>
            </view>
        </view>
        <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
    </view>
</template>

<script>
    import {getLabelReportingList} from "@/api/reporting/reporting.js"
    import {
        getLabelReportingList
    } from "@/api/reporting/reporting.js"
    export default {
        data(){
        data() {
            return {
                list:[]
                list: [],
                currentPage: 1,
                loadingStatus: 'nomore',
            }
        },
		
        onLoad(option){

        onLoad(option) {
            this.getList(option.type)
        },
		
        methods:{
            getList(type){
        onReachBottom() {
            this.currentPage++
            this.getList()
        },

        methods: {
            getList(type) {
                getLabelReportingList({
                    userId:uni.getStorageSync("userInfo").user_id,
                    page:1,
                    size:20,
                    eventType:type
                }).then(res=>{
                    console.log(res)
                    this.list = res.data.records;
                    userId: uni.getStorageSync("userInfo").user_id,
                    page: this.currentPage,
                    size: 10,
                    eventType: type
                }).then(res => {
                    if (res.code != 200) {
                        uni.showToast({
                            title: '数据请求失败',
                            icon: 'error'
                        })
                        return
                    }
                    let records = res.data.records;
                    this.list = [...this.list, ...records]
                    this.loadingStatus = 'nomore'
                })
            },
            navTo(id){
            navTo(id) {
                uni.navigateTo({
                    url:`/subPackage/workbench/views/bailReportDetail?id=${id}`
                    url: `/subPackage/workbench/views/bailReportDetail?id=${id}`
                })
            }
        }
@@ -54,23 +71,28 @@
</script>

<style lang="scss">
    page{
        background-color:#F5F5F5;
    page {
        background-color: #F5F5F5;
    }
    .list{
        margin:20rpx 30rpx 0;

    .list {
        margin: 20rpx 30rpx 0;
    }
    .list-item{
        padding:0 30rpx 20rpx;

    .list-item {
        padding: 0 30rpx 20rpx;
        border-radius: 8rpx;
        .item-title{
            padding:30rpx 0;
            border-bottom:1px solid #F5F5F5;

        .item-title {
            padding: 30rpx 0;
            border-bottom: 1px solid #F5F5F5;
        }
        .item-row{
            padding:10rpx 0;
            .address{
                width:65%;

        .item-row {
            padding: 10rpx 0;

            .address {
                width: 65%;
            }
        }
    }

 subPackage/label/hotel.vue

@@ -488,6 +488,7 @@
        font-size: 32rpx;
        color: #fff;
        margin-top: 50rpx;
        margin-bottom:20rpx;
    }

    .mb-20 {

 subPackage/label/hotel2.vue

File was deleted

 subPackage/label/hotelList.vue

@@ -1,49 +1,66 @@
<template>
    <view class="">
             <view class="list">
                 <view class="list-item bgc-ff mb-20"  v-for="(i,k) in list"  :key="k"  @click="navTo(i.taskId)">
                     <view class="item-title flex a-i-c j-c-s-b mb-20">
                         <text class="f-32 fw">{{i.hotelName}}</text>
                         <u-tag v-if="i.confirmFlag == 1" text="待审批" type="warning" plain plainFill></u-tag>
                         <u-tag v-if="i.confirmFlag == 2" text="审核通过" type="success" plain plainFill></u-tag>
                         <u-tag v-if="i.confirmFlag == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
                     </view>
                     <view class="item-row flex a-i-c j-c-s-b">
                         <text class="f-28">时间</text>
                         <text class="f-28 c-66">{{i.createTime}}</text>
                     </view>
                 </view>
             </view>	
        <view class="list">
            <view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k" @click="navTo(i.taskId)">
                <view class="item-title flex a-i-c j-c-s-b mb-20">
                    <text class="f-32 fw">{{i.hotelName}}</text>
                    <u-tag v-if="i.confirmFlag == 1" text="待审批" type="warning" plain plainFill></u-tag>
                    <u-tag v-if="i.confirmFlag == 2" text="审核通过" type="success" plain plainFill></u-tag>
                    <u-tag v-if="i.confirmFlag == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
                </view>
                <view class="item-row flex a-i-c j-c-s-b">
                    <text class="f-28">时间</text>
                    <text class="f-28 c-66">{{i.applyTime}}</text>
                </view>
            </view>
        </view>
        <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
    </view>
</template>

<script>
    import {getHotelReportingList} from "@/api/reporting/reporting.js"
    import {
        getHotelReportingList
    } from "@/api/reporting/reporting.js"
    export default {
        data(){
        data() {
            return {
                list:[]
                list: [],
                currentPage: 1,
                loadingStatus: 'nomore',
            }
        },
		
        onLoad(){

        onLoad() {
            this.getList()
        },
		
        methods:{
            getList(){
        onReachBottom() {
            this.currentPage++
            this.getList()
        },

        methods: {
            getList() {
                getHotelReportingList({
                    checkUserId:uni.getStorageSync("userInfo").user_id,
                    page:1,
                    size:20
                }).then(res=>{
                    console.log(res)
                    this.list = res.data.records;
                    checkUserId: uni.getStorageSync("userInfo").user_id,
                    page: this.currentPage,
                    size: 10
                }).then(res => {
                    if (res.code != 200) {
                        uni.showToast({
                            title: '数据请求失败',
                            icon: 'error'
                        })
                        return
                    }
                    let records = res.data.records;
                    this.list = [...this.list, ...records]
                    this.loadingStatus = 'nomore'
                })
            },
            navTo(id){
            navTo(id) {
                uni.navigateTo({
                    url:`/subPackage/workbench/views/hotelReportDetail?id=${id}`
                    url: `/subPackage/workbench/views/hotelReportDetail?id=${id}`
                })
            }
        }
@@ -51,23 +68,28 @@
</script>

<style lang="scss">
    page{
        background-color:#F5F5F5;
    page {
        background-color: #F5F5F5;
    }
    .list{
        margin:20rpx 30rpx 0;

    .list {
        margin: 20rpx 30rpx 0;
    }
    .list-item{
        padding:0 30rpx 20rpx;

    .list-item {
        padding: 0 30rpx 20rpx;
        border-radius: 8rpx;
        .item-title{
            padding:30rpx 0;
            border-bottom:1px solid #F5F5F5;

        .item-title {
            padding: 30rpx 0;
            border-bottom: 1px solid #F5F5F5;
        }
        .item-row{
            padding:10rpx 0;
            .address{
                width:65%;

        .item-row {
            padding: 10rpx 0;

            .address {
                width: 65%;
            }
        }
    }

 subPackage/workbench/views/audit.vue

@@ -1,14 +1,14 @@

<template>
    <view>
        <view class="tab">
            <u-tabs :list="tabList"  :current="tabIndex"  @click="changeTab"  :inactiveStyle="{color:'#999999'}"  :activeStyle="{color:'#017BFC'}"></u-tabs>
            <u-tabs :list="tabList" :current="tabIndex" @click="changeTab" :inactiveStyle="{color:'#999999'}"
                :activeStyle="{color:'#017BFC'}"></u-tabs>
        </view>
        <view class="list">
            <view class="list-item bgc-ff mb-20"  v-for="(i,k) in list"  :key="k"    @click="navTo(i.name,i.id)">
            <view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k" @click="navTo(i.name,i.id)">
                <view class="item-title flex a-i-c j-c-s-b mb-20">
                    <text class="f-32 fw">{{i.name}}</text>
                    <u-tag v-if="i.status == 1"  text="待审批" type="warning" plain plainFill></u-tag>
                    <u-tag v-if="i.status == 1" text="待审批" type="warning" plain plainFill></u-tag>
                    <u-tag v-if="i.status == 2" text="审核通过" type="success" plain plainFill></u-tag>
                    <u-tag v-if="i.status == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
                </view>
@@ -22,60 +22,61 @@
                </view>
            </view>
        </view>
         <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
        <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
    </view>
</template>

<script>
    import { getAuditReportingList } from "@/api/reporting/reporting"
    import {
        getAuditReportingList
    } from "@/api/reporting/reporting"
    export default {
        data(){
        data() {
            return {
                tabList:[
                tabList: [{
                        name: "待审核",
                        status: 1
                    },
                    {
                    name:"待审核",
                    status:1
                },
                {
                    name:"审核通过",
                    status:2
                },
                {
                    name:"已拒绝",
                    status:3
                },
                        name: "审核通过",
                        status: 2
                    },
                    {
                        name: "已拒绝",
                        status: 3
                    },
                ],
                tabIndex:0,
                currentStatus:1,
                list:[],
                tabIndex: 0,
                currentStatus: 1,
                list: [],
                loadingStatus: 'nomore',
                currentPage:1
                currentPage: 1
            }
        },
		
        onLoad(){

        onLoad() {
            this.getList()
        },
        onReachBottom() {
            this.currentPage++
            this.getPageList()
        },
		
        methods:{
            changeTab(e){

        methods: {
            changeTab(e) {
                this.tabIndex = e.index;
                this.currentStatus = e.status;
                this.list = [];
                this.currentPage = 1;
                this.getList();
            },
            getList(){
            getList() {
                getAuditReportingList({
                    page:this.currentPage,
                    size:20,
                    status:this.currentStatus
                }).then(res=>{
                    if(res.code != 200){
                    page: this.currentPage,
                    size: 20,
                    status: this.currentStatus
                }).then(res => {
                    if (res.code != 200) {
                        uni.showToast({
                            title: '数据请求失败',
                            icon: 'error'
@@ -87,12 +88,12 @@
                    this.loadingStatus = 'nomore'
                })
            },
            navTo(name,id){
                if(name == "旅馆安全"){
            navTo(name, id) {
                if (name == "旅馆安全") {
                    this.$u.func.globalNavigator(`hotelReportDetail?id=${id}`)
                }else if (name == "取保候审"){
                } else if (name == "取保候审") {
                    this.$u.func.globalNavigator(`bailReportDetail?id=${id}`)
                }else{
                } else {
                    this.$u.func.globalNavigator(`labelReportDetail?id=${id}`)
                }
            }
@@ -101,43 +102,50 @@
</script>

<style lang="scss">
    page{
        background-color:#F5F5F5;
    page {
        background-color: #F5F5F5;
    }
    .tab{
        width:100%;
        height:88rpx;
        position:fixed;

    .tab {
        width: 100%;
        height: 88rpx;
        position: fixed;
        /*#ifdef H5*/
        top:88rpx;
        top: 88rpx;
        /*#endif*/
         /*#ifdef MP-WEIXIN*/
        top:0;
        /*#ifdef MP-WEIXIN*/
        top: 0;
        /*#endif*/
        left:0;
        background-color:#fff;
        padding:0 30rpx;
        left: 0;
        background-color: #fff;
        padding: 0 30rpx;
        box-sizing: border-box;
        z-index: 999;
		

    }
    .tab /deep/.u-tabs__wrapper__nav__item{
        flex:1;

    .tab /deep/.u-tabs__wrapper__nav__item {
        flex: 1;
    }
    .list{
        margin:118rpx 30rpx 0;

    .list {
        margin: 118rpx 30rpx 0;
    }
    .list-item{
        padding:0 30rpx 20rpx;

    .list-item {
        padding: 0 30rpx 20rpx;
        border-radius: 8rpx;
        .item-title{
            padding:30rpx 0;
            border-bottom:1px solid #F5F5F5;

        .item-title {
            padding: 30rpx 0;
            border-bottom: 1px solid #F5F5F5;
        }
        .item-row{
            padding:10rpx 0;
            .address{
                width:65%;

        .item-row {
            padding: 10rpx 0;

            .address {
                width: 65%;
            }
        }
    }

 subPackage/workbench/views/bailReportDetail.vue

@@ -52,7 +52,7 @@
                            inputAlign="right"></u-input>
                        <u-icon slot="right" name="arrow-right"></u-icon>
                    </u-form-item>
                    <u-form-item label="报备位置" prop="checkUserName" borderBottom  @click="getLocation('returnLocation')">
                    <u-form-item label="报备位置" prop="checkUserName" borderBottom  @click="getLocation('startLocation')">
                        <u-input v-model="goOutInfo.startLocation" disabled disabledColor="#ffffff"
                            border="none" placeholder="请获取当前位置" placeholderClass="f-28 c-99"
                            inputAlign="right"></u-input>
@@ -66,7 +66,7 @@
                            inputAlign="right"></u-input>
                        <u-icon slot="right" name="arrow-right"></u-icon>
                    </u-form-item>
                    <u-form-item label="到达位置" prop="reachLocation" borderBottom  @click="getLocation('returnLocation')">
                    <u-form-item label="到达位置" prop="reachLocation" borderBottom  @click="getLocation('reachLocation')">
                        <u-input v-model="goOutInfo.reachLocation" disabled disabledColor="#ffffff"
                            border="none" placeholder="请获取当前位置" placeholderClass="f-28 c-99"
                            inputAlign="right"></u-input>
@@ -124,8 +124,11 @@
        </view>


        <view class="bottom-btn"    v-if="(roleType == 1 && status == 1) || (roleType == 2 && status == 2)">
        <view class="bottom-btn"    v-if="roleType == 1 && status == 1">
            <u-button type="primary" @click="submit">提交审核</u-button>
        </view>
        <view class="bottom-btn"    v-if="roleType == 2 && status == 2">
            <u-button type="primary" @click="submit">提交</u-button>
        </view>
        <u-datetime-picker ref="datetimePicker" :show="showSelectDate" v-model="goOutDate[tabIndex]" mode="datetime"
            :formatter="formatter" @confirm="confirmDate" @cancel="cancelPickerDate"></u-datetime-picker>
@@ -229,7 +232,7 @@
                    }
                ],
                tabIndex:0,
                goOutDate:["","",""],
                goOutDate:[new Date(),new Date(),new Date()],
                showSelectDate:false,
                status:1     ,//当前状态   1待审核  2审核通过   3审核不通过
                id:""
@@ -247,6 +250,9 @@
            } else {
                this.roleType = 1;
            }
            // this.goOutDate.forEach(item=>{
            //     item = new Date()
            // })
        },

        methods: {
@@ -256,14 +262,14 @@
            },
            
            showPickerDate(){
                if(this.roleType == 2) return;
                if(this.roleType == 2 && this.status != 2) return;
                this.showSelectDate = true;
            },
            cancelPickerDate(){
                this.showSelectDate = false;
            },
            showPicker(){
                if(this.roleType == 2) return;
                if(this.roleType == 2 && this.status != 2) return;
                this.isPickerShow = true
            },
            
@@ -291,7 +297,8 @@
            },
            
            getLocation(key){
                if(this.roleType == 2) return;
                console.log(key)
                if(this.roleType == 2 &&  this.status != 2) return;
                uni.chooseLocation({
                    success:(res)=>{
                        console.log(res);
@@ -362,7 +369,7 @@
            
            checkImages() {
                if (this.startImageUrls.length) {
                    this.$set(this.goOutInfo, "startImageUrls", this.setGoOutImages(this.fireImageUrls))
                    this.$set(this.goOutInfo, "startImageUrls", this.setGoOutImages(this.startImageUrls))
                }
                if (this.reachImageUrls.length) {
                    this.$set(this.goOutInfo, "reachImageUrls", this.setGoOutImages(this.reachImageUrls))
@@ -401,6 +408,10 @@
                            icon: 'error'
                        })
                    }else {
                        uni.showToast({
                            title: '提交成功!',
                            icon: 'success'
                        })
                        this.getDetailInfo(this.taskId)
                    }
                    // uni.navigateBack()
@@ -465,5 +476,10 @@
    
    
    }
    .upload-item {
        width: 140rpx;
        height: 140rpx;
        border: 1px solid #EEEEEE;
    }
    
</style>

 subPackage/workbench/views/cshw.vue

@@ -66,12 +66,14 @@
                tabStatus: 1,

                keyWord: '',

                loadingStatus: 'nomore',
                clickInfo: {}

                clickInfo: {},
                currentRole: {}

            }

        },

        onShow() {
            this.resetParams()

            this.getSiteList()

            this.getSiteList()
            this.currentRole = uni.getStorageSync("activeRole")

        },

        onReachBottom() {

            this.pagingParams.current++

@@ -129,7 +131,11 @@
                })

                return res

            },

            pushPage(placeId, id) {

            pushPage(placeId, id) {
                const { roleAlias } = this.currentRole
                if (roleAlias === "inhabitant") {
                    return
                }

                this.$u.func.globalNavigator(`/subPackage/workbench/views/examine?id=${id}&placeId=${placeId}`)

            }

        }

@@ -166,7 +172,8 @@
            padding: 10rpx 0;



            .address {

                width: 65%;

                width: 65%;
                text-align: right;

            }

        }

    }


 subPackage/workbench/views/editExamine.vue

@@ -6,10 +6,10 @@
                <u-form-item label="场所位置" required class="form-item" prop="localtion">

                    <u--input border="none" v-model="form.localtion"></u--input>

                </u-form-item>

                <u-form-item label="场所名称" required class="form-item"  prop="placeName">

                <u-form-item label="场所名称" required class="form-item" prop="placeName">

                    <u--input border="none" v-model="form.placeName"></u--input>

                </u-form-item>

                <u-form-item label="法人信息" required class="form-item"  prop="legalPerson">

                <u-form-item label="法人信息" required class="form-item" prop="legalPerson">

                    <u--input border="none" v-model="form.legalPerson"></u--input>

                </u-form-item>

                <u-form-item label="法人电话" class="form-item">

@@ -20,7 +20,7 @@
        <view class="">

            <box-title title="营业执照"></box-title>

            <view class="upload-img">

                <u-upload :fileList="form.images" :previewFullImage="uploadConfig.previewFullImage"

                <u-upload :fileList="form.imageUrls" :previewFullImage="uploadConfig.previewFullImage"

                    :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount"

                    :capture="uploadConfig.capture" @afterRead="afterReadImg" @delete="deletePic">

                </u-upload>

@@ -29,7 +29,7 @@
        <view class="">

            <box-title title="场所平面图"></box-title>

            <view class="upload-img">

                <u-upload :fileList="form.images" :previewFullImage="uploadConfig.previewFullImage"

                <u-upload :fileList="form.planImageUrls" :previewFullImage="uploadConfig.previewFullImage"

                    :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount"

                    :capture="uploadConfig.capture" @afterRead="afterReadImg" @delete="deletePic">

                </u-upload>

@@ -45,13 +45,16 @@
        <u-button type="success" plain class="add-person" @click="addPerson">在加一人</u-button>

        <view class="btn-group">

            <u-button class="btn-item" type="primary" @click="submit">提交</u-button>

            <u-button class="btn-item">我上报的事件</u-button>

            <u-button class="btn-item" @click="pushPage">我上报的事件</u-button>

        </view>

    </div>

</template>



<script>
    import { updatePlaceExtData } from '@/api/placeExp/placeExp.js'

<script>

    import {

        updatePlaceExtData,

        getPlaceDetail

    } from '@/api/placeExp/placeExp.js'

    import uploadMixin from "@/mixin/uploadMixin";

    import boxTtitle from '@/components/boxTitle/index.vue'

    import formItem from '../components/formItem.vue'

@@ -63,6 +66,8 @@
        data() {

            return {

                form: {

                    id: '',

                    placeId: '',

                    localtion: '',

                    placeName: '',

                    legalPerson: '',

@@ -87,22 +92,81 @@
                        trigger: ['blur', 'change']

                    }

                },

                personNum: 1

                personNum: 1,

                curSelectSite: {},

            }

        },

        methods: {
            updatePlaceExt() {
				
        onShow() {

            this.curSelectSite = uni.getStorageSync('siteInfo')

            this.getCsDetails()

        },

        methods: {

            getCsDetails() {

                getPlaceDetail({

                    placeId: this.curSelectSite.id

                }).then(detailRes => {

                    const { code, data } = detailRes

                    if (code !== 200) {

                        uni.showToast({

                            title: '数据请求失败',

                            icon: 'error'

                        })

                        return

                    }

                    const placePractitioner = data?.placePractitioner || []

                    Object.keys(this.form).forEach(key => {

                        this.form[key] = data[key]

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

                            this.form[key] = []

                            !!data[key] && this.form[key].push()

                        }

                    })

                    this.personNum = placePractitioner.length

                    this.$nextTick(() => {

                        console.log(placePractitioner);

                        this.$refs.formItemRef.forEach((item, index) => {

                            item.form = placePractitioner[index]

                        })

                    })

                })

            },

            updatePlaceExt(data) {

                data['imageUrls'] = JSON.stringify(data['imageUrls'])

                data['planImageUrls'] = JSON.stringify(data['planImageUrls'])

                updatePlaceExtData({...data}).then(res => {

                    const { code } = res

                    if (code !== 200) {

                        uni.showToast({

                            title: '提交失败',

                            icon: 'error'

                        })

                        return

                    }

                    uni.showToast({

                        title: '提交成功',

                        icon: 'success',

                        complete() {

                            setTimeout(() => {

                                uni.navigateBack()

                            }, 1500)

                        }

                    })

                })

            },

            addPerson() {

                this.personNum++

            },

            submit() {

                const personList = []

                const placePractitioner = []

                this.$refs.formItemRef.forEach(item => {

                    personList.push(item.form)

                    item.form.placeId = this.form.placeId

                    placePractitioner.push(item.form)

                })

                console.log(personList);

                this.form.placePractitioner = placePractitioner

                this.updatePlaceExt(this.form)

            },

            pushPage() {

                this.$u.func.globalNavigator('/subPackage/workbench/views/cshw')

            }

        }

    }