liuyg
2022-03-08 7600d3d84bf3bd78f58a5308a4fd5bed8b206556
+选择完成人员
11 files modified
339 ■■■■ changed files
pages/grabOrders/grabOrdersZAFFPX - 副本/feedback.vue 13 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/feedback.vue 93 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue 2 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/map.vue 2 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/feedback.vue 87 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/grabOrders.vue 42 ●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/map.vue 2 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAYWXC/feedback.vue 79 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue 2 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAYWXC/map.vue 2 ●●● patch | view | raw | blame | history
static/style/app.scss 15 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX - 副本/feedback.vue
@@ -10,6 +10,19 @@
            </u-navbar>
        </view> -->
        <view class="mapJQtijiaomain">
            <view class="title" style="padding-top: 0.5rem;">任务完成者:</view>
            <view class="f">
                <view class="fren-main" style="margin:0 1rem;">
                    <view class="fren-main-but">
                        <u-button @click="checkedAll" :plain="true" type="primary" size="mini">全选</u-button><br />
                    </view>
                    <!-- <u-button @click="checkedAllFill">全不选</u-button> -->
                    <u-checkbox-group @change="checkboxGroupChange">
                        <u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list"
                            :key="index" :name="item.name">{{item.name}}</u-checkbox>
                    </u-checkbox-group>
                </view>
            </view>
            <view class="title" style="padding-top: 0.5rem;">请输入任务心得:</view>
            <view class="f">
                <view class="main" style="margin:0 1rem;">
pages/grabOrders/grabOrdersZAFFPX/feedback.vue
@@ -10,6 +10,19 @@
            </u-navbar>
        </view> -->
        <view class="mapJQtijiaomain">
            <view class="title" style="padding-top: 0.5rem;">任务完成者:</view>
            <view class="f">
                <view class="fren-main" style="margin:0 1rem;">
                    <view class="fren-main-but">
                        <u-button @click="checkedAll" :plain="true" type="primary" size="mini">全选</u-button><br />
                    </view>
                    <!-- <u-button @click="checkedAllFill">全不选</u-button> -->
                    <u-checkbox-group @change="checkboxGroupChange">
                        <u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list"
                            :key="index + item.name" :name="item.name">{{item.name}}</u-checkbox>
                    </u-checkbox-group>
                </view>
            </view>
            <view class="title" style="padding-top: 0.5rem;">请输入任务心得:</view>
            <view class="f">
                <view class="main" style="margin:0 1rem;">
@@ -61,7 +74,24 @@
                yj: '', //意见
                imgs: [],
                videos: [],
                data: {}
                data: {},
                list: [{
                        name: '张三',
                        checked: true,
                        disabled: false
                    },
                    {
                        name: '李四',
                        checked: true,
                        disabled: false
                    },
                    {
                        name: '王五一',
                        checked: true,
                        disabled: false
                    },
                ]
            }
        },
        onBackPress(e) {
@@ -73,6 +103,25 @@
            return true;
        },
        methods: {
            // 选中某个复选框时,由checkbox时触发
            checkboxChange(e) {
                // console.log(e);
            },
            // 选中任一checkbox时,由checkbox-group触发
            checkboxGroupChange(e) {
                // console.log(e);
            },
            // 全选
            checkedAll() {
                this.list.map(val => {
                    val.checked = true;
                })
            },
            checkedAllFill() {
                this.list.map(val => {
                    val.checked = false;
                })
            },
            onLoad: function(option) {
                var b;
                if (option.data == undefined) {
@@ -97,6 +146,17 @@
                // console.log(b);
                console.log(b, "bbbbbbbb")
                this.data = b;
                this.list = [];
                let lit = b.serid.split(",");
                let teams = b.team.split(",");
                for (let k in lit) {
                    this.list.push({
                        name: teams[k - 1] || b.captain,
                        id: lit[k],
                        checked: true,
                        disabled: false
                    })
                }
            },
            upData() {
                // console.log('开始上传');
@@ -121,14 +181,30 @@
                    tpurl: imgs,
                    spurl: video,
                    hdid: this.data.id,
                    serid: uni.getStorageSync("ids") || that.$store.state.puserID
                    serid: '',
                    // serid: uni.getStorageSync("ids") || that.$store.state.puserID
                    // result: this.content,
                };
                // 传入选定的完成人员
                let chouse = [];
                for (let ik in this.list) {
                    if (this.list[ik].checked) {
                        chouse.push(this.list[ik].id);
                    }
                }
                // console.log(chouse);
                for (let ck in chouse) {
                    dataList.serid += chouse[ck];
                    if (ck != chouse.length - 1) {
                        dataList.serid += ',';
                    }
                }
                // console.log(dataList.serid);
                // return
                wx.showLoading({
                    title: "提交中...",
                    mask: true
                })
                // console.log(dataList);
                wx.request({
                    url: this.$store.state.piAPI + 'taskfk/save', //仅为示例,并非真实接口地址。
                    data: dataList,
@@ -316,6 +392,17 @@
                // border: 1px solid rgba($color: #000000, $alpha: 0.5);
                height: 8rem;
            }
            // .fren-main {
            //     height: auto;
            //     display: flex;
            //     // justify-content: center;
            //     flex-wrap: wrap;
            //     .u-checkbox__label {
            //         min-width: 45px !important;
            //     }
            // }
        }
        .t,
pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
@@ -172,7 +172,7 @@
                //打开地图
                // console.log(this.swiperCurrent)
                val["buttype"] = this.swiperCurrent == 1 ? 0 : (this.swiperCurrent == 0 ? 1 : 2); //tab标识,0正在进行,1可参与
                val["serid"] = (uni.getStorageSync("ids") || this.$store.state.puserID) + ",";
                // val["serid"] = (uni.getStorageSync("ids") || this.$store.state.puserID) + ",";
                val["appenUrl"] = this.$store.state.piAPI;
                //打开地图
pages/grabOrders/grabOrdersZAFFPX/map.vue
@@ -327,7 +327,7 @@
                        //     }
                        // })
                        let rid = that.ourData.id,
                            serid = that.ourData.serid,
                            serid = uni.getStorageSync("ids") || that.$store.state.puserID,
                            type = 'start',
                            url = that.$store.state.piAPI + "taskqd/startTask?" +
                            `rid=${rid}&serid=${serid}&type=${type}`;
pages/grabOrders/grabOrdersZAXC/feedback.vue
@@ -10,6 +10,19 @@
            </u-navbar>
        </view> -->
        <view class="mapJQtijiaomain">
            <view class="title" style="padding-top: 0.5rem;">任务完成者:</view>
            <view class="f">
                <view class="fren-main" style="margin:0 1rem;">
                    <view class="fren-main-but">
                        <u-button @click="checkedAll" :plain="true" type="primary" size="mini">全选</u-button><br />
                    </view>
                    <!-- <u-button @click="checkedAllFill">全不选</u-button> -->
                    <u-checkbox-group @change="checkboxGroupChange">
                        <u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list"
                            :key="index" :name="item.name">{{item.name}}</u-checkbox>
                    </u-checkbox-group>
                </view>
            </view>
            <view class="title" style="padding-top: 0.5rem;">请输入任务心得:</view>
            <view class="f">
                <view class="main" style="margin:0 1rem;">
@@ -61,7 +74,32 @@
                yj: '', //意见
                imgs: [],
                videos: [],
                data: {}
                data: {},
                list: [{
                        name: '张三',
                        checked: true,
                        disabled: false
                    },
                    {
                        name: '李四',
                        checked: true,
                        disabled: false
                    },
                    {
                        name: '王五一',
                        checked: true,
                        disabled: false
                    }, {
                        name: '张三',
                        checked: true,
                        disabled: false
                    }, {
                        name: '张三',
                        checked: true,
                        disabled: false
                    },
                ]
            }
        },
        onBackPress(e) {
@@ -73,6 +111,25 @@
            return true;
        },
        methods: {
            // 选中某个复选框时,由checkbox时触发
            checkboxChange(e) {
                console.log(e);
            },
            // 选中任一checkbox时,由checkbox-group触发
            checkboxGroupChange(e) {
                console.log(e);
            },
            // 全选
            checkedAll() {
                this.list.map(val => {
                    val.checked = true;
                })
            },
            checkedAllFill() {
                this.list.map(val => {
                    val.checked = false;
                })
            },
            onLoad: function(option) {
                var b;
                if (option.data == undefined) {
@@ -97,6 +154,17 @@
                // console.log(b);
                console.log(b, "bbbbbbbb")
                this.data = b;
                this.list = [];
                let lit = b.serid.split(",");
                let teams = b.team.split(",");
                for (let k in lit) {
                    this.list.push({
                        name: teams[k - 1] || b.captain,
                        id: lit[k],
                        checked: true,
                        disabled: false
                    })
                }
            },
            upData() {
                // console.log('开始上传');
@@ -121,9 +189,24 @@
                    tpurl: imgs,
                    spurl: video,
                    hdid: this.data.id,
                    serid: uni.getStorageSync("ids") || that.$store.state.puserID
                    serid: '',
                    // serid: uni.getStorageSync("ids") || that.$store.state.puserID
                    // result: this.content,
                };
                // 传入选定的完成人员
                let chouse = [];
                for (let ik in this.list) {
                    if (this.list[ik].checked) {
                        chouse.push(this.list[ik].id);
                    }
                }
                // console.log(chouse);
                for (let ck in chouse) {
                    dataList.serid += chouse[ck];
                    if (ck != chouse.length - 1) {
                        dataList.serid += ',';
                    }
                }
                wx.showLoading({
                    title: "提交中...",
                    mask: true
pages/grabOrders/grabOrdersZAXC/grabOrders.vue
@@ -12,7 +12,7 @@
                <view class="swiper-item">
                    <scroll-view scroll-y :style="{ height: useHeight, width: '100%' }" @scrolltolower="onreachBottom">
                        <page0 :listData="leftdata" :swiperCurrent="0" v-if="item.name == '正在进行'" @openOnce="openOnce"
                            @getOrders="getOrders" @outOrders="outOrders"></page0>
                            @getOrders="getOrders"></page0>
                        <page1 :listData="rightdata" :swiperCurrent="1" v-if="item.name == '可参与'" @openOnce="openOnce"
                            @getOrders="getOrders"></page1>
                        <page2 :listData="overdata" :swiperCurrent="2" v-if="item.name == '已完成'" @openOnce="openOnce"
@@ -108,12 +108,9 @@
                this.current = 1;
                this.swiperCurrent = 1;
            }
            if (options.in == 1) {
                this.current = 1;
                this.swiperCurrent = 1;
            } else if (options.in == 2) {
                this.current = 2;
                this.swiperCurrent = 2;
            if (options.in) {
                this.current = 0;
                this.swiperCurrent = 0;
            }
            this.getGrabOrders(this.current);
@@ -122,29 +119,6 @@
            }
        },
        methods: {
            //取消任务
            outOrders(d) {
                let that = this;
                uni.request({
                    url: this.$store.state.piAPI +
                        `taskqd/cancelTask?rid=${d.rid}&serid=${d.serid}&name=${that.$store.state.puserName}`,
                    method: "get",
                    // data: d,
                    header: {
                        "content-type": "application/x-www-form-urlencoded",
                    },
                    success(res) {
                        const data = res.data.msg;
                        if (data == "操作成功") {
                            uni.showToast({
                                title: data,
                                duration: 2000,
                            });
                        }
                        that.$store.commit("changegotuGrabOrders");
                    }
                })
            },
            //实时位置传递
            setNowposition(rid, jd, wd) {
                console.log(uni.getStorageSync("ids") || this.$store.state.puserID, rid, jd, wd);
@@ -172,7 +146,7 @@
                //打开地图
                // console.log(this.swiperCurrent)
                val["buttype"] = this.swiperCurrent == 1 ? 0 : (this.swiperCurrent == 0 ? 1 : 2); //tab标识,0正在进行,1可参与
                val["serid"] = (uni.getStorageSync("ids") || this.$store.state.puserID) + ",";
                // val["serid"] = (uni.getStorageSync("ids") || this.$store.state.puserID) + ",";
                val["appenUrl"] = this.$store.state.piAPI;
                //打开地图
@@ -216,7 +190,7 @@
                        tasktype: '0'
                    };
                let isWhere = val == 0 ? "可参与" : val == 1 ? "正在进行" : "已完成";
                if (val == 0) {
                if (val == 1) {
                    d.jurisdiction = this.$store.state.UserData.jurisdiction;
                    d.workjurisdiction = this.$store.state.UserData.workjurisdiction;
                }
@@ -400,8 +374,8 @@
                        }
                        // that.listData = data;
                        // that.getGrabOrders(this.);
                        that.current = 1;
                        that.swiperCurrent = 1;
                        that.current = 0;
                        that.swiperCurrent = 0;
                        that.$store.commit("changegotuGrabOrders");
                    },
pages/grabOrders/grabOrdersZAXC/map.vue
@@ -368,7 +368,7 @@
                        //     }
                        // })
                        let rid = that.ourData.id,
                            serid = that.ourData.serid,
                            serid = uni.getStorageSync("ids") || that.$store.state.puserID,
                            type = 'start',
                            url = that.$store.state.piAPI + "taskqd/startTask?" +
                            `rid=${rid}&serid=${serid}&type=${type}`;
pages/grabOrders/grabOrdersZAYWXC/feedback.vue
@@ -10,6 +10,19 @@
            </u-navbar>
        </view> -->
        <view class="mapJQtijiaomain">
            <view class="title" style="padding-top: 0.5rem;">任务完成者:</view>
            <view class="f">
                <view class="fren-main" style="margin:0 1rem;">
                    <view class="fren-main-but">
                        <u-button @click="checkedAll" :plain="true" type="primary" size="mini">全选</u-button><br />
                    </view>
                    <!-- <u-button @click="checkedAllFill">全不选</u-button> -->
                    <u-checkbox-group @change="checkboxGroupChange">
                        <u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list"
                            :key="index" :name="item.name">{{item.name}}</u-checkbox>
                    </u-checkbox-group>
                </view>
            </view>
            <view class="title" style="padding-top: 0.5rem;">请输入任务心得:</view>
            <view class="f">
                <view class="main" style="margin:0 1rem;">
@@ -61,7 +74,24 @@
                yj: '', //意见
                imgs: [],
                videos: [],
                data: {}
                data: {},
                list: [{
                        name: '张三',
                        checked: true,
                        disabled: false
                    },
                    {
                        name: '李四',
                        checked: true,
                        disabled: false
                    },
                    {
                        name: '王五一',
                        checked: true,
                        disabled: false
                    },
                ]
            }
        },
        onBackPress(e) {
@@ -73,6 +103,25 @@
            return true;
        },
        methods: {
            // 选中某个复选框时,由checkbox时触发
            checkboxChange(e) {
                console.log(e);
            },
            // 选中任一checkbox时,由checkbox-group触发
            checkboxGroupChange(e) {
                console.log(e);
            },
            // 全选
            checkedAll() {
                this.list.map(val => {
                    val.checked = true;
                })
            },
            checkedAllFill() {
                this.list.map(val => {
                    val.checked = false;
                })
            },
            onLoad: function(option) {
                var b;
                if (option.data == undefined) {
@@ -97,6 +146,17 @@
                // console.log(b);
                console.log(b, "bbbbbbbb")
                this.data = b;
                this.list = [];
                let lit = b.serid.split(",");
                let teams = b.team.split(",");
                for (let k in lit) {
                    this.list.push({
                        name: teams[k - 1] || b.captain,
                        id: lit[k],
                        checked: true,
                        disabled: false
                    })
                }
            },
            upData() {
                // console.log('开始上传');
@@ -121,9 +181,24 @@
                    tpurl: imgs,
                    spurl: video,
                    hdid: this.data.id,
                    serid: uni.getStorageSync("ids") || that.$store.state.puserID
                    serid: '',
                    // serid: uni.getStorageSync("ids") || that.$store.state.puserID
                    // result: this.content,
                };
                // 传入选定的完成人员
                let chouse = [];
                for (let ik in this.list) {
                    if (this.list[ik].checked) {
                        chouse.push(this.list[ik].id);
                    }
                }
                // console.log(chouse);
                for (let ck in chouse) {
                    dataList.serid += chouse[ck];
                    if (ck != chouse.length - 1) {
                        dataList.serid += ',';
                    }
                }
                wx.showLoading({
                    title: "提交中...",
                    mask: true
pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
@@ -173,7 +173,7 @@
                // console.log(this.swiperCurrent)
                val["buttype"] = this.swiperCurrent == 1 ? 0 : (this.swiperCurrent == 0 ? 1 :
                    2); //tab标识,0正在进行,1可参与
                val["serid"] = (uni.getStorageSync("ids") || this.$store.state.puserID) + ",";
                // val["serid"] = (uni.getStorageSync("ids") || this.$store.state.puserID) + ",";
                val["appenUrl"] = this.$store.state.piAPI;
                //打开地图
pages/grabOrders/grabOrdersZAYWXC/map.vue
@@ -366,7 +366,7 @@
                        //     }
                        // })
                        let rid = that.ourData.id,
                            serid = that.ourData.serid,
                            serid = uni.getStorageSync("ids") || that.$store.state.puserID,
                            type = 'start',
                            url = that.$store.state.piAPI + "taskqd/startTask?" +
                            `rid=${rid}&serid=${serid}&type=${type}`;
static/style/app.scss
@@ -79,3 +79,18 @@
    background-color: $u-content-color;
}
/* end--演示页面使用的统一样式--end */
.fren-main {
                height: auto;
                display: flex;
                // justify-content: center;
                flex-wrap: wrap;
                .u-checkbox__label {
                    min-width: 45px !important;
                }
                .fren-main-but{
                    width: 100%;
                }
            }