新需求修改

wjt

2024-07-29 2ffea51205b7eb94cf3fb7221aede7ff66669fc1

新需求修改

 api/policy.js

@@ -23,6 +23,10 @@
export function orderDetails(data) {
    return http.get(`/enforce/order/${data.orderId}`, {params: data}, { custom: { loading: true }});
}
// 获取执法单 详情 /enforce/order/{orderId}
export function orderDetailsLog(data) {
    return http.get(`/enforce/complaint/log/${data.id}`, {params: data}, { custom: { loading: true }});
}
// 执法审批列表 

export function checkLogList(data) {

 common/config.js

@@ -3,14 +3,14 @@
    hasHead: true,
    authCallBackUrl: 'https://wxbank.hnnx.com/mer/payOut/getAuthCode.do?authCallBackUrl=',
    webURL: 'https://jmy.jinmingyuan.com/ecosphere-user',
    serverTempl:"http://172.16.60.184:8089",
    serverTempl:"http://172.16.60.135:8089",
    socketTempl:"wss://yqzx.jinmingyuan.com/wsPerCode",
    h5Temp:"https://yqzx.jinmingyuan.com/ecosphere-h5",
    serverUrl: 'http://172.16.60.184:8089',
    h5Url: 'http://172.16.60.184:8089/service-merchant',
    serverUrl: 'http://172.16.60.135:8089',
    h5Url: 'http://172.16.60.135:8089/service-merchant',
    ftpUrl: 'https://yqzx.jinmingyuan.com/file',
    // ftpUrl: 'https://echftp.jinmingyuan.com',
    baseUrl: 'http://172.16.60.184:8089',
    baseUrl: 'http://172.16.60.135:8089',
    wx_appid: 'wxad8cc511da676bd4',
    ali_appid: '2021003199690698'
}

 pages/visitiorRegis/visitiorRegis.vue

@@ -100,14 +100,24 @@
                    addLog(this.form).then(val => {
                        // console.log(val)
                        if(val.data.code == 200) {
                            uni.showToast({
                                title: '登记成功',
                                icon: 'none',
                                duration: 5000
                            })
                            setTimeout(() => {
                            // uni.showToast({
                            //     title: '登记成功',
                            //     icon: 'none',
                            //     duration: 5000
                            // })
                            // setTimeout(() => {
                            //     uni.navigateBack()
                            // }, 500)
                            uni.showModal({
                                title: '提示',
                                content: '登记成功',
                                showCancel: false,
                                success: val => {
                                    if(val.confirm) {
                                uni.navigateBack()
                            }, 500)
                                    }
                                }
                            })
                        }
                    })
                }).catch(err => {

 policy/policyApply/perPicker.vue

@@ -5,7 +5,10 @@
                <view class="button" @click="cancel" size="mini">取消</view>
                <view class="button entery" @click="entery" color="#1171E0" size="mini">确定</view>
            </view>
            <view class="set-flex">
            <u-search v-model="companyName" @search="companyList" @clear="clearContent" @confirm="companyList" @custom="companyList()"></u-search>
                <text @click="addContent">新增</text>
            </view>
            <view>
                <picker-view immediate-change :value="value" @change="bindChange" class="picker-view">
                    <picker-view-column>
@@ -53,14 +56,15 @@
                this.index = e.detail.value[0]
            },
            companyList() {
                companyList({companyName: this.companyName, companyStatus: 0, checkStatus: 2}).then(val => {
                return companyList({companyName: this.companyName, companyStatus: 0, checkStatus: 2}).then(val => {
                    if(val.data.code == 200){
                        if(!val.data.rows.length || !val.data.rows){
                            uni.showToast({
                                title: '没有符合的数据，请检查输入的执法对象',
                                icon: 'none',
                                duration: 3000
                            })
                            // uni.showToast({
                            //     title: '没有符合的数据，请检查输入的执法对象',
                            //     icon: 'none',
                            //     duration: 3000
                            // })
                            this.columns = val.data.rows || []
                        } else {
                            this.columns = val.data.rows
                        }
@@ -72,6 +76,16 @@
                const info = this.columns[this.index]
                this.$emit('confirm', info)
                this.show = false
            },
            async addContent() {
                await this.companyList()
                // console.log(this.columns.length)
                if(this.columns.length) {
					
                } else {
                    this.$emit('setCompany', this.companyName)
                    this.show = false
                }
            }
            
        }
@@ -115,4 +129,18 @@
            height: 500rpx;
            margin-top: 20rpx;
        }
        .set-flex{
            display: flex;
            justify-content: flex-start;
            align-items: center;
            text{
                display: inline-block;
                background-color: $main-color;
                color: white;
                border-radius: 5px;
                padding: 5px 15px;
                margin-left: 20rpx;
                font-size: 24rpx;
            }
        }
</style>

 policy/policyApply/policyApply.vue

@@ -13,8 +13,7 @@
                        执法对象
                    </view>
                    <view class="input" @click="search">

                        <input type="text" style="width: 80%;" disabled  placeholder="请输入" :value="form.companyName"/>
                        <input type="text" style="width: 80%;" disabled  placeholder="请选择" :value="form.companyName"/>
                        <u-icon name="arrow-right"></u-icon>
                        <!-- <u-text text='搜索' type="primary" style="width: 20%;" @click="search"></u-text> -->
                    </view>
@@ -24,7 +23,7 @@
                        执法时间
                    </view>
                    <view class="input" @click="showTimeFun">
                        <input type="text" placeholder="请输入" disabled v-model.trim="form.planTimeStr"/>
                        <input type="text" placeholder="请选择" disabled v-model.trim="form.planTimeStr"/>
                        <u-icon name="arrow-right"></u-icon>
                    </view>
                </view>
@@ -33,7 +32,7 @@
                        执法类型
                    </view>
                    <view class="input">
                        <input type="text" placeholder="请输入" v-model.trim="form.enforceTypeName" disabled/>
                        <input type="text" placeholder="请选择" v-model.trim="form.enforceTypeName" disabled/>
                        <u-icon name="arrow-right"></u-icon>
                    </view>
                </view>
@@ -63,7 +62,7 @@
                    <view style="width: 60%;">{{form.applyDeptName}}</view>
                </view>
                <view class="form-item sui" style="align-items: flex-start;" @click="openPer">
                    <view class="form-label require ">
                    <view class="form-label  ">
                        随行人员
                    </view>
                    <view>
@@ -128,7 +127,7 @@
        
            
        </u-picker> -->
        <perPicker ref="perPicker" :immediateChange="true" @confirm="confirmSearch" @cancel="show = false" :columns="columns" keyName="companyName"></perPicker>
        <perPicker ref="perPicker" @setCompany="setCompany" :immediateChange="true" @confirm="confirmSearch" @cancel="show = false" :columns="columns" keyName="companyName"></perPicker>
             <yt-dateTimePicker
                  ref="myPicker"
                  @submit="confirmTime"
@@ -241,9 +240,9 @@
                if(!this.form.companyName || !this.form.companyName.replace(/\s+/g, "")){
                    return '请选择执法对象'
                }
                if(!this.form.companyId) {
                    return '请点击搜索确认执法对象'
                }
                // if(!this.form.companyId) {
                //     return '请点击搜索确认执法对象'
                // }
                if(!this.form.planTimeStr) {
                    return '请填写执法时间'
                }
@@ -254,9 +253,9 @@
                if(!this.form.enforceContent || !this.form.enforceContent.replace(/\s+/g, "")) {
                    return '请填写执法内容'
                }
                if(!this.form.peers.length){
                    return '请选择随行人员'
                }
                // if(!this.form.peers.length){
                //     return '请选择随行人员'
                // }
                return ''
            },
            submitApply(){
@@ -312,7 +311,10 @@
                this.form.companyPhone = value.companyPhone
                this.form.companyUser = value.companyUser
                this.form.companyAddress = value.companyAddress
                console.log(this.form.companyName)
                // console.log(this.form.companyName)
            },
            setCompany(e) {
                this.form.companyName = e
            },
            confirmTime(e) {
                this.form.planTime = e.year + '-' + e.month+ '-' + + e.day + ' ' + e.hour + ":" + "00:00"

 policy/reportPage/reportPage.vue

@@ -7,14 +7,14 @@
                    <text class="status">待上报</text>
                </view>
                <view class="user-info">
                    <text>{{item.executeUser}}</text>
                    <text>{{item.executeUser || ''}}</text>
                    <!-- <view class="driver"></view>
                    <text>{{item.executeDeptName}}</text> -->
                </view>
                <view class="user-info">
                    <!-- <text>{{item.executeUser}}</text>
                    <view class="driver"></view> -->
                    <text>{{item.executeDeptName}}</text>
                    <text>{{item.executeDeptName || ''}}</text>
                </view>
                <view class="set-line">
                    <text>执法对象：</text>{{item.companyName}}

 policy/translate/translate.vue

@@ -24,19 +24,36 @@
                    <view class="set-line">
                        <text>执法对象：</text>{{item.companyName}}
                    </view>
					
                    <view class="line"></view>
                    <view class="set-flex set-start set-flex-content-between">
                        <view>
                        <view style="width: 75%;">
                            <view class="set-line1">
                                <text>执法时间：</text>{{item.planTime}}
                            </view>
                            <view class="set-line1">
                                <text>申请时间：</text>{{item.applyTime}}
                            </view>
                            <view class="look" v-if="item.show">
                                <view class="set-line">
                                    <text>执法主题：</text>{{item.enforceReason}}
                                </view>
                                <view class="set-line">
                                    <text>执法类型：</text>{{handlerType(item.enforceType)}}
                                </view>
                                <view class="set-line set-line-flex">
                                    <text>执法内容：</text> <view>{{item.enforceContent}}</view>
                                </view>
                            </view>
							
                        </view>
                        <view class="button" v-if="!isJudege" @click.self="goStartJudeg([item.orderId])">
                            审批
                        </view>
                    </view>
                    <view @click="showItem(item)" class="icon" style="text-align: center;display: flex;justify-content: center;align-items: center;">
                        <u-icon name="arrow-down" color="#bfbfbf" size="20" v-if="!item.show"></u-icon>
                        <u-icon name="arrow-up" color="#bfbfbf" size="20" v-else></u-icon>
                    </view>
                </view>
            </view>
@@ -61,6 +78,7 @@
<script>
    import popupCom from '@/policy/components/popup.vue'
    import { checkLogList, checkUpd } from '@/api/policy.js'
    import { getDicts } from '@/api/data.js'
    export default {
        components: {
            popupCom
@@ -79,7 +97,8 @@
                    isAsc: "desc",
                    orderByColumn: "apply_time"
                },
                recordList: []
                recordList: [],
                typeList: []
            }
        },
        computed: {
@@ -93,7 +112,8 @@
            }
        },
        onLoad() {
            this.checkLogList()
			
            this.getDicts()
        },
        onReachBottom() {
            if(this.total == this.list.length) {
@@ -101,8 +121,26 @@
            }
            this.queryms.pageNum++
            this.checkLogList()
			
        },
        methods: {
            showItem(item) {
                item.show = !item.show
            },
            handlerType(type) {
                const value = this.typeList.find(item => item.dictCode == type)
                if(value) {
                    return value.dictLabel
                } else {
                    return ''
                }
            },
            getDicts(type) {
                getDicts('enforce_type').then(val => {
                    this.typeList = val.data.data
                    this.checkLogList()
                })
            },
            goRecord() {
                uni.navigateTo({
                    url: `/policy/translateRecord/translateRecord`
@@ -170,6 +208,7 @@
                checkLogList(this.queryms).then(val => {
                    val.data.rows.map(item => {
                        item.isSelect = false
                        item.show = false
                    })
                    this.list = [...this.list,...val.data.rows ]
                    this.total = val.data.total
@@ -194,4 +233,16 @@
        background-color: #F4F4F4 !important;
        border: none;
    }
    .set-line-flex{
        display: flex;
        justify-content: flex-start;
        align-items: flex-start;
        text{
            width: 28%;
            display: inline-block;
        }
        & > view{
            width: 70%;
        }
    }
</style>

 qiye/my/my.vue

@@ -20,6 +20,27 @@
                <text>{{userPhone||""}}</text>
            </view>
            <view class="wbox">
                <view class="item" @click="goChangePhone()">

                    <view class="set-flex">

                        <image src="/static/policy/phone.png" mode="widthFix"></image>

                        <text class="change">修改手机号</text>

                    </view>

                    <u-icon name="arrow-right"></u-icon>

                </view>

                <view class="item" @click="goProposal()">

                    <view class="set-flex">

                        <image src="/static/policy/personal.png" mode="widthFix"></image>

                        <text class="change">投诉举报</text>

                    </view>

                    <u-icon name="arrow-right"></u-icon>

                </view>

                <view class="item" @click="goProposal1()">

                    <view class="set-flex">

                        <image src="/static/policy/jianyi.png" mode="widthFix"></image>

                        <text class="change">建议/诉求</text>

                    </view>

                    <u-icon name="arrow-right"></u-icon>

                </view>
                <view class="item" @click="tousu()">
                    <view class="set-flex">
                        <image src="/static/qiye/q06.png" mode="widthFix"></image>
@@ -38,27 +59,6 @@
                    <view class="set-flex">

                        <image src="/static/qiye/qiehuan.png" mode="widthFix"></image>

                        <text class="change">切换账号</text>

                    </view>

                    <u-icon name="arrow-right"></u-icon>

                </view>
                <view class="item" @click="goChangePhone()">
                    <view class="set-flex">
                        <image src="/static/policy/phone.png" mode="widthFix"></image>
                        <text class="change">修改手机号</text>
                    </view>
                    <u-icon name="arrow-right"></u-icon>
                </view>

                <view class="item" @click="goProposal()">

                    <view class="set-flex">

                        <image src="/static/policy/personal.png" mode="widthFix"></image>

                        <text class="change">投诉</text>

                    </view>

                    <u-icon name="arrow-right"></u-icon>

                </view>

                <view class="item" @click="goProposal1()">

                    <view class="set-flex">

                        <image src="/static/policy/jianyi.png" mode="widthFix"></image>

                        <text class="change">建议</text>

                    </view>

                    <u-icon name="arrow-right"></u-icon>

                </view>

 qiye/record/details.vue

@@ -8,9 +8,10 @@
        <view class="donw-box"></view>

        <view class="page-main">

            <view class="title">

                <template v-if="msg.isEva==0">未评价</template>

                执法详情

            <!--     <template v-if="msg.isEva==0">未评价</template>

                <template v-if="msg.isEva==1">已评价</template>

                <template v-if="msg.orderStatus==2">待执法</template>

                <template v-if="msg.orderStatus==2">待执法</template> -->

            </view>

            <view class="wbox">

                <view class="item">

@@ -37,14 +38,14 @@
                        {{msg.executeDeptName || msg.applyDeptName}}

                    </view>

                </view>

                <view class="item">

                <!-- <view class="item">

                    <view class="k">

                        企业

                    </view>

                    <view class="v">

                        {{msg.companyName}}

                    </view>

                </view>

                </view> -->

            </view>

            <view style="height: 20rpx;"></view>

            <view class="wbox">

@@ -58,10 +59,10 @@
                </view>

                <view class="item">

                    <view class="k">

                        执法过程

                        执法内容

                    </view>

                    <view class="v" v-if="!img.length">

                        {{msg.regionReason || '执法过程待上报'}}

                        {{ msg.enforceContent}}

                    </view>

                </view>

                <view class="imgbox"  v-if="img.length">

@@ -79,7 +80,7 @@
                        执法结果

                    </view>

                    <view class="v" style="color: #EB4746;">

                        {{msg.regionReason || '执法结果待上报'}}

                        {{msg.regionReason || '--'}}

                    </view>

                </view>

                <view class="item">

@@ -87,7 +88,7 @@
                        执法时间

                    </view>

                    <view class="v">

                        {{msg.inTime || "待执法"}}

                        {{msg.inTime || msg.planTime}}

                    </view>

                </view>

            </view>


 qiye/record/record.vue

@@ -161,15 +161,20 @@
                })

            },

            getList() {

                uni.showLoading({

                    title: '加载中...',

                    mask: true

                })

                let data = uni.getStorageSync("qiyedata")

                this.queryParams.companyId = data.companyId

                companyList({

                    ...this.queryParams,

                    ...this.list[this.current].value

                }).then(val => {

                    // console.log(val.data)

                    this.total = val.data.total

                    this.list1 = [...this.list1, ...val.data.rows]

                }).catch(err => {

                    uni.hideLoading()

                })

            },

            click(i) {