智慧保安APP验收版本
zengh
2021-12-04 6f9695b74f5184e831926c6a1b1ada15ba68e3d8
问题修复
5 files modified
175 ■■■■■ changed files
pages/dispatch/imgissue.vue 23 ●●●●● patch | view | raw | blame | history
pages/dispatch/receive.vue 2 ●●● patch | view | raw | blame | history
pages/dispatch/text.vue 24 ●●●● patch | view | raw | blame | history
pages/report/initiate.vue 104 ●●●●● patch | view | raw | blame | history
pages/securityStaff/information.vue 22 ●●●●● patch | view | raw | blame | history
pages/dispatch/imgissue.vue
@@ -8,6 +8,11 @@
                <u-form-item label-width='132' prop="content" label="指令内容" :required="true">
                    <u-input type='textarea' v-model="form.content" placeholder="请输入指令内容" />
                </u-form-item>
                <u-form-item label-width='132' label="下发时间" :required="true">
                    <u-picker v-model="Timeshow" mode="time" :params="params" @confirm="setTime"></u-picker>
                    <u-input type='textarea' v-model="form.reportTime" placeholder="请选择下发时间" @click="Timeshow = true" />
                </u-form-item>
                <u-form-item label-width='158' prop="recipientText" label="指令接收人" :required="true">
@@ -80,11 +85,21 @@
            return {
                recipientShow: false,
                recipientList: [],
                Timeshow:false,
                params: {
                    year: true,
                    month: true,
                    day: true,
                    hour: true,
                    minute: false,
                    second: false
                },
                form: {
                    content: '',
                    recipient: '',
                    recipientData: [],
                    recipientPeople: ''
                    recipientPeople: '',
                    reportTime:""
                },
                rules: {
@@ -108,6 +123,9 @@
            this.$refs.uForm.setRules(this.rules);
        },
        methods: {
            setTime(res){
                this.form.reportTime = res.year + "-" + res.month + "-" + res.day + " " + res.hour + ":00:00"
            },
            recipientClick() {
                if (this.recipientList.length > 0) {
                    this.recipientShow = true;
@@ -188,7 +206,8 @@
                                sendDirectiveId: this.$store.state
                                    .UserData.user_id,
                                content: this.form.content,
                                url: imgurl
                                url: imgurl,
                                sendTime:this.form.reportTime
                            },
                            success: (res) => {
pages/dispatch/receive.vue
@@ -121,7 +121,7 @@
                }
                uni.request({
                    url: this.$store.state.piAPI + "/directive/page?sendDirectiveId=" + this.$store.state
                    url: this.$store.state.piAPI + "/directive/page?receiveDirectiveIds=" + this.$store.state
                        .puserID,
                    method: "get",
                    data: {
pages/dispatch/text.vue
@@ -9,6 +9,11 @@
                    <u-input type='textarea' v-model="form.content" placeholder="请输入指令内容" />
                </u-form-item>
                <u-form-item label-width='132' label="下发时间" :required="true">
                    <u-picker v-model="Timeshow" mode="time" :params="params" @confirm="setTime"></u-picker>
                    <u-input type='textarea' v-model="form.reportTime" placeholder="请选择下发时间" @click="Timeshow = true" />
                </u-form-item>
                <u-form-item label-width='158' prop="recipientText" label="指令接收人" :required="true">
                    <u-input type='textarea' v-model="form.recipientPeople" placeholder="请选择指令接收人"
@@ -69,12 +74,21 @@
            return {
                recipientShow: false,
                recipientList: [],
                Timeshow:false,
                params: {
                    year: true,
                    month: true,
                    day: true,
                    hour: true,
                    minute: false,
                    second: false
                },
                form: {
                    content: '',
                    recipient: '',
                    recipientData: [],
                    recipientPeople: ''
                    recipientPeople: '',
                    reportTime:""
                },
                rules: {
@@ -97,6 +111,9 @@
            this.$refs.uForm.setRules(this.rules);
        },
        methods: {
            setTime(res){
                this.form.reportTime = res.year + "-" + res.month + "-" + res.day + " " + res.hour + ":00:00"
            },
            recipientClick() {
                if (this.recipientList.length > 0) {
                    this.recipientShow = true;
@@ -167,7 +184,8 @@
                                // 发送
                                sendDirectiveId: this.$store.state
                                    .UserData.user_id,
                                content: this.form.content
                                content: this.form.content,
                                sendTime:this.form.reportTime
                            },
                            success: (res) => {
                                if (res.data.msg.indexOf('成功') != -1) {
pages/report/initiate.vue
@@ -20,40 +20,46 @@
                </u-form-item>
                <u-form-item label-width='132' prop="content" label="汇报内容" :required="true">
                    <u-input type='textarea' v-model="form.content" placeholder="请输入汇报内容" />
                    <u-input v-model="form.content" placeholder="请输入汇报内容" />
                </u-form-item>
                <u-form-item label-width='132' label="汇报时间" :required="true">
                    <u-picker v-model="Timeshow" mode="time" :params="params" @confirm="setTime"></u-picker>
                    <u-input type='textarea' v-model="form.reportTime" placeholder="请选择汇报时间" @click="Timeshow = true"/>
                </u-form-item>
                <u-form-item label-width='132' label="接收人">
                    <u-input type='textarea' v-model="form.recipientPeople" placeholder="请选择接收人"
                        @click="recipientClick" autoHeight  />
                    <u-input type='textarea' v-model="form.recipientPeople" placeholder="请选择接收人" @click="recipientClick"
                        autoHeight />
                    <u-popup :closeable="true" v-model="recipientShow" mode="bottom" height="50%" border-radius="14">
                            <view>
                                <u-checkbox-group v-show="recipientList.length > 0" @change="checkboxGroupChange" :wrap='true' :size="40">
                                    <u-checkbox v-model="item.checked" v-for="(item, index) in recipientList" :key="index"
                                        :name="item.id" shape="circle"
                                        style="padding: 0 40rpx; height: 92rpx; position: relative; box-sizing: border-box;">
                                        <view style="margin-left: 22rpx">
                                            {{item.real_name}}
                                        </view>
                                    </u-checkbox>
                                </u-checkbox-group>
                                <view style=" height: 92rpx; padding: 0 40rpx;" v-show="recipientList.length == 0">
                                    暂无数据
                                </view>
                        <view>
                            <u-checkbox-group v-show="recipientList.length > 0" @change="checkboxGroupChange"
                                :wrap='true' :size="40">
                                <u-checkbox v-model="item.checked" v-for="(item, index) in recipientList" :key="index"
                                    :name="item.id" shape="circle"
                                    style="padding: 0 40rpx; height: 92rpx; position: relative; box-sizing: border-box;">
                                    <view style="margin-left: 22rpx">
                                        {{item.real_name}}
                                    </view>
                                </u-checkbox>
                            </u-checkbox-group>
                            <view style=" height: 92rpx; padding: 0 40rpx;" v-show="recipientList.length == 0">
                                暂无数据
                            </view>
                        </view>
                    </u-popup>
                </u-form-item>
@@ -82,8 +88,15 @@
                categoryShow: false,
                typeShow: false,
                recipientShow: false,
                Timeshow: false,
                params: {
                    year: true,
                    month: true,
                    day: true,
                    hour: true,
                    minute: false,
                    second: false
                },
                categoryList: [],
                typeList: [{
                        value: '1',
@@ -107,6 +120,7 @@
                    type: '',
                    typeText: '',
                    recipientData: [],
                    reportTime: "",
                    recipientPeople: ''
                },
                rules: {
@@ -177,6 +191,9 @@
        },
        methods: {
            setTime(res){
                this.form.reportTime = res.year + "-" + res.month + "-" + res.day + " " + res.hour + ":00:00"
            },
            categoryClick() {
                this.categoryShow = true;
            },
@@ -232,15 +249,15 @@
                                this.recipientList = []
                                res.data.data.forEach(item => {
                                    var flag = true
                                    if (this.recipientList.length > 0) {
                                        this.recipientList.forEach(it => {
                                            if (item.id == it.id) flag = false
                                        })
                                    }
                                    if (flag == true) {
                                        if (item.id != this.$store.state
                                            .UserData.user_id
@@ -249,13 +266,13 @@
                                            this.recipientList.push(item)
                                        }
                                    }
                                })
                                this.recipientShow = true;
                                this.peopleSelect = true;
                            }
                        });
@@ -280,26 +297,26 @@
                this.form.type = e[0].value
                this.form.typeText = e[0].label
            },
            initiateClick() {
                this.$refs.uForm.validate(valid => {
                    if (valid) {
                        if (this.form.recipientData.length == 0) {
                            this.$refs.uToast.show({
                                title: '请最少选择一个接收人',
                            })
                            return
                        }
                        var str = '';
                        this.form.recipientData.forEach(item => {
                            str += item + ','
                        })
                        str = str.substr(0, str.length - 1);
                        uni.request({
                            url: this.$store.state.piAPI + "/workReport/submit",
                            method: "post",
@@ -309,6 +326,7 @@
                                content: this.form.content,
                                userId: this.$store.state.puserID,
                                deptId: this.$store.state.UserData.dept_id,
                                reportTime: this.form.reportTime,
                                receivedIds: str
                            },
                            success: (res) => {
@@ -330,10 +348,10 @@
                var that = this
                this.form.recipientData = e
                var str = ""
                var num = 0
                that.form.recipientData.forEach((item, index) => {
                    that.recipientList.forEach((it, index) => {
                        if (item == it.id) {
@@ -348,7 +366,7 @@
                        }
                    })
                })
                this.form.recipientPeople = str
            },
pages/securityStaff/information.vue
@@ -14,6 +14,12 @@
                <i>性别</i> <span> {{ datalist.sex == 2 ? '女' : datalist.sex == 1 ? '男' : ' ' }} </span>
            </view>
            <view class="once">
                <i>身份证</i> <span> {{ datalist.cardid }} </span>
            </view>
            <view class="once">
                <i>保安员证</i> <span> {{ datalist.securitynumber }} </span>
            </view>
            <view class="once">
                <i>籍贯</i> <span> {{ datalist.nativeplace }} </span>
            </view>
            <view class="once">
@@ -90,14 +96,14 @@
                        </template>
                        <template v-slot:content>
                            <view>
                                <view class="u-order-title">在职时间:<view class="titles">
                                        {{item.entrytime}}至 {{item.departuretime}}
                                <view class="u-order-title">派遣时间:<view class="titles">
                                        {{item.dispatchertime}}至 {{item.endTime}}
                                    </view>
                                </view>
                                <view class="u-order-desc">公司名称:{{item.companyname}}</view>
                                <view class="u-order-desc">岗位:{{item.post}}</view>
                                <view class="u-order-desc">岗位职责:{{item.responsibilities}}</view>
                                <view class="u-order-time">离职原因:{{item.leaving}}</view>
                                <view class="u-order-desc">派遣单位名称:{{item.dispatcheraddress}}</view>
                                <view class="u-order-desc">派遣单位地址:{{item.dispatcherAddress}}</view>
                                <view class="u-order-desc">负责人:{{item.dispatcherPerson}}</view>
                                <view class="u-order-time">联系方式:{{item.dispatcherPhone}}</view>
                            </view>
                        </template>
                    </u-time-line-item>
@@ -166,9 +172,9 @@
                this.showc = true;
            },
            getcongye() {
                var url = this.$store.state.piAPI + '/experience/page',
                var url = this.$store.state.piAPI + 'dispatcher/queryDispatcher',
                    data = {
                        securityid: this.datalist.id
                        userIds: this.datalist.id
                    },
                    that = this;