Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/MCR/MarketCustomerResourcesHome.vue

@@ -91,6 +91,11 @@
                     <el-table-column prop="birthday" label="生日">
                     </el-table-column>
                     <el-table-column prop="weight" label="权重">
+                        <template slot-scope="scope">
+                            <span v-if="scope.row.weight == '393'">A</span>
+                            <span v-else-if="scope.row.weight == '392'">B</span>
+                            <span v-else-if="scope.row.weight == '391'">C</span>
+                        </template>
                     </el-table-column>
                     <el-table-column prop="ascribedDepartment" label="业务归属">
                         <template slot-scope="scope">
@@ -234,7 +239,7 @@ export default {
             //初始化界面数据
             this.$axios.post('/api/MarketCustomerResources/QueryNewClientData', this.pageloadData, {
                 headers: {
-                    'Authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1laWRlbnRpZmllciI6IkZ1dHVyZSIsImV4cCI6MTY3OTU0MjgwNSwiaXNzIjoiT0FTeXN0ZW0uY29tIiwiYXVkIjoiT0FTeXN0ZW0uY29tIn0.iy5SUInq1p3yjZultRPyzCa2ekLeepSdMLxvPwXY6MI',
+                    'Authorization': that.token,
                 }
             }).then(resp => {
                 if (resp.data.code == 200) {

src/components/MCR/MarketCustomerResourcesOperation.vue

@@ -293,7 +293,7 @@ export default {
             //初始化界面数据
             this.$axios.post('/api/MarketCustomerResources/QuerySelectAndSingleData', { Id: this.requestData.id }, {
                 headers: {
-                    'Authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1laWRlbnRpZmllciI6IkZ1dHVyZSIsImV4cCI6MTY3OTU0MjgwNSwiaXNzIjoiT0FTeXN0ZW0uY29tIiwiYXVkIjoiT0FTeXN0ZW0uY29tIn0.iy5SUInq1p3yjZultRPyzCa2ekLeepSdMLxvPwXY6MI',
+                    'Authorization': that.token,
                 }
             }).then(resp => {
                 console.log(resp);
@@ -362,7 +362,7 @@ export default {
 
                 this.$axios.post('/api/MarketCustomerResources/NewClientOp', this.requestData, {
                     headers: {
-                        'Authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1laWRlbnRpZmllciI6IkZ1dHVyZSIsImV4cCI6MTY3OTU0MjgwNSwiaXNzIjoiT0FTeXN0ZW0uY29tIiwiYXVkIjoiT0FTeXN0ZW0uY29tIn0.iy5SUInq1p3yjZultRPyzCa2ekLeepSdMLxvPwXY6MI',
+                        'Authorization': that.token,
                     }
                 }).then(resp => {
                     if (resp.data.code == 200) {

src/components/OP/InvitationOfficialActivities.vue

@@ -192,13 +192,16 @@ export default {
             this.InvitationOfficialActivities();
         },
         AirTicketResSelectChange() {
+            this.InvitationOfficialActivities();
             for (let index = 0; index < this.AirTicketResSelectData.length; index++) {
-                if (this.AirTicketResSelectData[index].id == parseInt(this.diId)) {
+
+                if (this.AirTicketResSelectData[index].id == parseInt(this.DiId)) {
+                    debugger
                     this.delegationInfo = this.AirTicketResSelectData[index];
                     break;
                 }
             }
-            this.AirTicketResList();
+
         },
         //商邀费用信息绑定
         InvitationOfficialActivities() {

src/components/child/AuthorityJob.vue

@@ -7,6 +7,11 @@
                         <el-option v-for="item in authority" :key="item.value" :label="item.name" :value="item.id">
                         </el-option>
                     </el-select>
+                    <el-select v-model="pageValue" filterable placeholder="页面名称搜索" @change="pageChange">
+                        <el-option v-for="item in pageOptions" :key="item.pageid" :label="item.pageName"
+                            :value="item.pageid">
+                        </el-option>
+                    </el-select>
                 </div>
                 <div class="job-input">
                     <el-select @change="companyChange()" v-model="valuecorporation" clearable placeholder="公司">
@@ -87,6 +92,8 @@ export default {
             loading: true,
             userId: 0,
             token: '',
+            pageOptions: [],
+            pageValue: ''
         }
     },
     methods: {
@@ -102,6 +109,7 @@ export default {
         //模块下拉框
         Inquirechange() {
             this.currentPage = 1;
+            this.pageValue = '';
             this.pageload(this.value);
         },
         //多选框选中方法
@@ -306,12 +314,47 @@ export default {
                 }
             });
             console.warn(this.authorityLists);
+        },
+        pageChange() {
+            console.log(this.pageValue);
+            var that = this;
+            let ischange = false;
+            this.pageOptions.forEach(function (item, index) {
+                if (item.pageid == that.pageValue) {
+                    ischange = true;
+                    that.value = item.modulid;
+                }
+            })
+
+            if (ischange) {
+                this.Inquirechange();
+            } else {
+                console.log("搜索异常!!");
+            }
+
+        },
+        loadPages() {
+            var that = this;
+            this.$axios.post('/api/System/PageConfigInit', {
+
+            }, {
+                headers: {
+                    'Authorization': that.token,
+                }
+            }).then(resp => {
+                console.log(resp.data.data);
+                if (resp.data.code == 200) {
+                    that.pageOptions = resp.data.data.viewList.data;
+                }
+            })
+
         }
     },
     mounted() {
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
         this.pageload(13);
+        this.loadPages();
     }
 }
 </script>

src/components/child/AuthorityUser.vue

@@ -7,6 +7,11 @@
                         <el-option v-for="item in authority" :key="item.value" :label="item.name" :value="item.id">
                         </el-option>
                     </el-select>
+                    <el-select v-model="pageValue" filterable placeholder="页面名称搜索" @change="pageChange">
+                        <el-option v-for="item in pageOptions" :key="item.pageid" :label="item.pageName"
+                            :value="item.pageid">
+                        </el-option>
+                    </el-select>
                 </div>
                 <div class="job-input">
                     <el-select @change="companyChange()" v-model="valuecorporation" clearable placeholder="公司">
@@ -92,6 +97,8 @@ export default {
             Valueuesr: '',//员工val
             userId: 0,
             token: '',
+            pageOptions: [],
+            pageValue: ''
         }
     },
     methods: {
@@ -107,6 +114,7 @@ export default {
         //模块下拉框
         Inquirechange() {
             this.currentPage = 1;
+            this.pageValue = '';
             this.pageload(this.value);
         },
         //多选框选中方法
@@ -352,12 +360,47 @@ export default {
         },
         unique(arr) {
             return Array.from(new Set(arr));
+        },
+        pageChange() {
+            console.log(this.pageValue);
+            var that = this;
+            let ischange = false;
+            this.pageOptions.forEach(function (item, index) {
+                if (item.pageid == that.pageValue) {
+                    ischange = true;
+                    that.value = item.modulid;
+                }
+            })
+
+            if (ischange) {
+                this.Inquirechange();
+            } else {
+                console.log("搜索异常!!");
+            }
+
+        },
+        loadPages() {
+            var that = this;
+            this.$axios.post('/api/System/PageConfigInit', {
+
+            }, {
+                headers: {
+                    'Authorization': that.token,
+                }
+            }).then(resp => {
+                console.log(resp.data.data);
+                if (resp.data.code == 200) {
+                    that.pageOptions = resp.data.data.viewList.data;
+                }
+            })
+
         }
     },
     mounted() {
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
         this.pageload(13);
+        this.loadPages();
     }
 }
 </script>