0929tz

src/components/OP/Groupedit.vue

@@ -56,8 +56,42 @@
                     <el-form-item label-width="120px" label="出访天数:" prop="numdays">
                         <el-input @blur="splicingname" el-input v-model="ruleForm.numdays"></el-input>
                     </el-form-item>
-                    <el-form-item label-width="120px" label="出访人数:" prop="numperson">
+                    <el-form-item style="position: relative;" label-width="120px" label="出访人数:" prop="numperson">
                         <el-input el-input v-model="ruleForm.numperson"></el-input>
+                        <!-- 客户名单 -->
+                        <el-popover
+                        placement="bottom"
+                        width="662"
+                        trigger="hover">
+                            <el-table max-height="600" border :data="rollcallarr">
+                                <el-table-column width="100" property="date" label="姓名">
+                                    <template slot-scope="scope">
+                                        {{ scope.row.lastName}}{{scope.row.firstName}}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column width="200" property="birthDay" label="拼音">
+                                    <template slot-scope="scope">
+                                        {{ pinyingxing(scope.row.lastName) }}/{{  pinyingxing(scope.row.firstName) }}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column width="50" property="sex" label="性别">
+                                    <template slot-scope="scope">
+                                        {{ scope.row.sex==0?'男':'女'}}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column width="110" property="birthDay" label="生日">
+                                    <template slot-scope="scope">
+                                        {{ fgarr(scope.row.birthDay) }}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column width="200"  label="身份证号码">
+                                    <template slot-scope="scope">
+                                        {{ scope.row.idCardNo==""?'-':scope.row.idCardNo }}
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                            <span v-if="editid!=undefined" slot="reference" style="cursor: pointer;position: absolute;right: -65px;color: red;">客户名单</span>
+                        </el-popover>
                     </el-form-item>
                     <el-form-item label-width="120px" label="团组名称:" prop="groupname">
                         <el-input el-input v-model="ruleForm.groupname"></el-input>
@@ -69,7 +103,7 @@
                     
                 </div>
                 <div style="display: flex;">
-                    <el-form-item style="width: 36.5%;" label-width="120px" label="是否用于投标:">
+                    <el-form-item style="width: 35%;" label-width="120px" label="是否用于投标:">
                         <el-radio-group v-model="ruleForm.radioval" @change="agreeChange">
                             <el-radio label="0">否</el-radio>
                             <el-radio label="1">是</el-radio>
@@ -188,6 +222,7 @@
 <script>
 import { el } from '@fullcalendar/core/internal-common';
 import { all } from 'q';
+import { pinyin } from 'pinyin-pro';
 export default {
     // beforeRouteLeave(to, from, next) {
     //     console.log(to);
@@ -295,10 +330,20 @@ export default {
             restaurants: [],
             restaurantss:[],
             customerunitslist:[],
-            bidbr:true
+            bidbr:true,
+            rollcallarr:[]
         };
     },
     methods: {
+        //拼音
+        pinyingxing(val){
+            return pinyin(val, { toneType: 'none' }).toUpperCase();
+        },
+        //fenge
+        fgarr(val){
+            val=val+""
+            return val.split(' ')[0]
+        },
         querySearch(queryString, cb) {
             var restaurants = this.restaurants;
             var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
@@ -559,13 +604,25 @@ export default {
             }).then(function (res) {
                 console.log(res)
                 if (res.data.code == 200) {
-                    that.$message({
-                        message: res.data.msg,
-                        type: 'success',
-                        offset: 50
-                    });
+                    if (status==2) {
+                        that.$message({
+                            message: res.data.msg,
+                            type: 'success',
+                            offset: 50
+                        });
+                        that.$confirm(res.data.msg+'是否跳转到客户名单?', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                        type: 'warning'
+                        }).then(() => {
+                            that.$router.push({path: '/home/PickupList?id=' +that.editid +''});
+                        }).catch(() => {
+                            that.$router.go(-1);
+                        });
+                    }else{
+                        that.$router.go(-1);
+                    }
                     that.fullscreenLoading = false;
-                    that.$router.go(-1);
                 } else {
                     that.$message({
                         message: res.data.msg,
@@ -598,7 +655,35 @@ export default {
                 this.ruleForm.opRoyaltyLv=995
                 this.commissionlevel( this.ruleForm.opRoyaltyLv)
             }
-        }
+        },
+        //获取客户名单info
+        PostTourClientListByDiId() {
+            this.rollcallarr=[];
+            if (this.editid==undefined) {
+                return
+            }
+            var that = this
+            var url = "/api/Groups/PostTourClientListByDiId"
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    portType:1,
+                    diid: that.editid,
+                    pageId:104,
+                    userId:233
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.rollcallarr=res.data.data;
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
     },
     beforeRouteEnter(to, from, next) {
         next();
@@ -607,6 +692,9 @@ export default {
         this.editid = this.$route.query.id;
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userid = JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
+        setTimeout(() => {
+            this.PostTourClientListByDiId();
+        }, 500);
         this.getSalesQuoteNo();
         this.getdown();
         this.getGroupInfo();

src/components/OP/PickupList.vue

@@ -711,10 +711,13 @@ export default {
                     portType: 1
                 }
             }).then(function (res) {
-                console.log(res)
                 if (res.data.code == 200) {
                     that.delegationInfoList = res.data.data;
-                    that.diId = that.delegationInfoList[0].id;
+                    if (that.$route.query.id!=undefined) {
+                        that.diId=Number(that.$route.query.id);
+                    }else{
+                        that.diId = that.delegationInfoList[0].id;
+                    }
                     that.PostShareGroupInfo();
                 }
             }).catch(function (error) {
@@ -1331,7 +1334,7 @@ export default {
     mounted() {
         console.log(this.tourClientListInfos)
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
-        this.pageId = Number(localStorage.getItem('indexs').split('-')[1]);//页面id
+        this.pageId = 104;//页面id
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
         this.GetGroupNameList();
         this.PostTourClientListBasicDataInit()