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

src/components/MCR/MarketCustomerResourcesHome.vue

@@ -141,22 +141,22 @@
                     </el-table-column>
                     <el-table-column prop="contact" label="联系人" width="90">
                         <template slot-scope="scope">
-                            <span>{{scope.row.contact==0?'-':scope.row.contact}}</span>
+                            <span>{{ scope.row.contact == 0 ? '-' : scope.row.contact }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="job" label="职位" width="110">
                         <template slot-scope="scope">
-                            <span>{{scope.row.job==0?'-':scope.row.job}}</span>
+                            <span>{{ scope.row.job == 0 ? '-' : scope.row.job }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="telephone" label="手机号" width="120">
                         <template slot-scope="scope">
-                            <span>{{scope.row.telephone==0?'-':scope.row.telephone}}</span>
+                            <span>{{ scope.row.telephone == 0 ? '-' : scope.row.telephone }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="phone" label="座机号" width="120">
                         <template slot-scope="scope">
-                            <span>{{scope.row.phone==0?'-':scope.row.phone}}</span>
+                            <span>{{ scope.row.phone == 0 ? '-' : scope.row.phone }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="location" label="所在区域" width="130">
@@ -445,8 +445,8 @@ export default {
                 opTypeLabel: '',
                 opUserLabel: '',
                 time: '',
-            },
-                this.logchange();
+            };
+            this.logchange();
         },
         //条件颜色
         addClass({ row, column, rowIndex, columnIndex }) {
@@ -533,13 +533,23 @@ export default {
             })
         },
         pageload() {
+
             var that = this;
-            if (this.userId == 21 || this.userId == 95|| this.userId == 380) {
-                this.isSelect = false;
-            }
-            that.pageloadData.operationUserId = that.userId
+            this.$axios.post('/api/MarketCustomerResources/QueryUnlockDropList', {}, {
+                headers: {
+                    'Authorization': that.token,
+                },
+            }).then(resp => {
+                if (resp.data.code == 200) {
+                    if (resp.data.data.includes(that.userId)) {
+                        that.isSelect = false;
+                    }
+                }
+            })
+
+            that.pageloadData.operationUserId = that.userId;
             //初始化界面数据
-            console.log(that.pageloadData)
+            //console.log(that.pageloadData)
             this.$axios.post('/api/MarketCustomerResources/QueryNewClientData', that.pageloadData, {
                 headers: {
                     'Authorization': that.token,

src/main.js

@@ -40,11 +40,11 @@ Vue.use(common);//全局
 import plugin from './plugin'//全局
 Vue.use(plugin);//全局
 
-import websocket  from './store/websocket.js'
+import websocket from './store/websocket.js'
 Vue.prototype.$websocket = websocket//websocket
 
 //禁用浏览器前进后腿
-window.addEventListener('popstate', function() {
+window.addEventListener('popstate', function () {
   history.pushState(null, null, document.URL)
 })