liuhj hace 10 meses
padre
commit
21a4573ea5

+ 96 - 62
src/components/MCR/AssociatedInvitees.vue

@@ -29,9 +29,9 @@
                     </el-select>
                 </el-form-item>
             </el-form>
-            <div style="margin-left: 20px;">
+            <!-- <div style="margin-left: 20px;">
                 <el-button type="primary">查询</el-button>
-            </div>
+            </div> -->
         </div>
         <div class="AssociatedInvitees-table">
             <el-table
@@ -39,18 +39,58 @@
                 border
                 style="width: 100%">
                 <el-table-column
-                prop="date"
-                label="日期"
-                width="180">
+                prop="teamName"
+                label="团组名称">
+                </el-table-column>
+                <el-table-column
+                prop="clientUnit"
+                label="客户单位">
+                </el-table-column>
+                <el-table-column
+                prop="clientName"
+                label="客户名称"
+                width="80">
+                </el-table-column>
+                <el-table-column
+                prop="visitStartDate"
+                :formatter="filteryear"
+                label="开始时间"
+                width="110">
+                </el-table-column>
+                <el-table-column
+                prop="visitEndDate"
+                :formatter="filteryears"
+                label="结束时间"
+                width="110">
+                </el-table-column>
+                <el-table-column
+                prop="visitDays"
+                label="天数"
+                width="50">
                 </el-table-column>
                 <el-table-column
-                prop="name"
-                label="姓名"
-                width="180">
+                prop="visitPNumber"
+                label="人数"
+                width="50">
                 </el-table-column>
                 <el-table-column
-                prop="address"
-                label="地址">
+                prop="visitCountry"
+                label="国家"
+                width="150">
+                </el-table-column>
+                <el-table-column
+                prop="jietuanOperator"
+                label="接团人"
+                width="80">
+                </el-table-column>
+                <el-table-column label="操作"  width="200">
+                    <el-button
+                    size="mini"
+                    title="查看邀请方"
+                    type="primary"
+                    >查看邀请方</el-button>
+                    <!-- <template slot-scope="scope">
+                    </template> -->
                 </el-table-column>
             </el-table>
             <div class="block">
@@ -74,57 +114,7 @@ export default {
             companyname:'',
             companynamearr:[],
             currentPage4: 4,
-            tableData: [
-                {
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-                },{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-                },{
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-                },{
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-                },
-            ] 
+            tableData: [] 
         }
     },
     methods: {
@@ -133,8 +123,52 @@ export default {
         },
         handleCurrentChange(val) {
             console.log(`当前页: ${val}`);
-        }
+        },
+        filteryear(val){
+            let gstime=val.visitStartDate.split(' ')[0]
+            return gstime;
+        },
+        filteryears(val){
+            let gstime=val.visitEndDate.split(' ')[0]
+            return gstime;
+        },
+        //获取表格
+        PostGroupLinkInvitingPageList() {
+            var url = "/api/Groups/PostGroupLinkInvitingPageList"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+                data:{
+                    portType:1,
+                    pageIndex:1,
+                    pageSize:10,
+                    counrty:'',
+                    area:'',
+                    teamName:'',
+                    unitName:'',
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.tableData=res.data.data;
+                }else{
+                    that.$message({
+                        message:res.data.msg,
+                        duration:1000,
+                        type:"error"
+                    });
+                }
+            }).catch(function (error) {
+                that.$message.error('请联系信息部!');
+            });
+        },
     },
+    mounted(){
+        this.PostGroupLinkInvitingPageList();
+    }
 }
 </script>
 <style>

+ 0 - 1
src/components/Resource/OpOfficialActivities.vue

@@ -351,7 +351,6 @@ export default {
                 tel: [
                     { required: true, message: '该信息为必填信息', trigger: 'blur' },
                     { required: true, message: '该信息为必填信息', trigger: 'change' },
-                    { pattern: /^-?\d+\.?\d*$/, message: '请输入正确数据', trigger: 'blur' }
                 ],
                 dresscode: [
                     { required: true, message: '该信息为必填信息', trigger: 'blur' },