init

src/views/Customer/CompanyRecord.vue

@@ -101,6 +101,7 @@
               <el-button type="text" v-if="cus_crd_del" size="small" @click="toinifodelete(scope)">删除</el-button>
               <!-- <el-button  type="text" size="small"  @click="editOpera(scope.row,0)">管理系统运营</el-button>
               <el-button  type="text" size="small"  @click="editOpera(scope.row,1)">管理代理商运营</el-button> -->
+                            <el-button  type="text" size="small" v-if="cus_com_sys" @click="editOpera(scope.row,0)">系统运营</el-button>
               <el-button  type="text" v-if="cus_crd_bindAgent" size="small"  @click="bindAgent(scope.row)">绑定代理商</el-button>
                <el-button  type="text" v-if="cus_crd_open" size="small"  @click="toDisable(scope.row)">{{scope.row.lockFlag==0?'禁用':'启用'}}</el-button>
             </template>
@@ -502,6 +503,8 @@ export default {
     this.cus_crd_del = this.permissions["cus_crd_del"];
     this.cus_crd_bindAgent = this.permissions["cus_crd_bindAgent"];
     this.cus_crd_open = this.permissions["cus_crd_open"];
+    this.cus_com_sys = this.permissions["cus_com_sys"];
+    this.cus_com_sys1 = this.permissions["cus_com_sys1"];
   },
   mounted() {
     this.orgType=localStorage.getItem('orgType')
@@ -563,8 +566,9 @@ export default {
       // console.log(idx,orgId);
       // return
       this.$api.api.zkoperationrecordFindByOrg({
-        orgType:idx==0?'1':'2',
-        orgId
+        orgType:2,
+        orgId,
+        operationType:this.idx==0?'1':'2'
       })
       .then(res=>{
         // console.log(res);
@@ -736,11 +740,12 @@ export default {
         this.passFlag=false
     },
     //获取运营人员
-    getAllOperationsStaff(idx){
+    //获取运营人员
+    getAllOperationsStaff(idx,row){
          this.optionsoperationStaff=[];
          if(idx==1){
           this.$api.http.getAllOperationsStaffByAgent({
-              agentId:localStorage.getItem('agentId')
+              orgCode:row.orgCode
             }).then((res) => {
               this.optionsoperationStaff= res.data
               this.operaVisible=true

src/views/Customer/Companymanagement.vue

@@ -93,8 +93,8 @@
               <!-- <el-button type="text" size="small" @click="infoeditor(scope.row)">编辑</el-button>
               <el-button type="text" size="small" @click="inforeplace(scope.row)">更换账号</el-button>
               <el-button type="text" size="small" @click="toinifodelete(scope)">删除</el-button> -->
-              <el-button  type="text" size="small" v-if="cus_com_sys" @click="editOpera(scope.row,0)">管理系统运营</el-button>
-              <el-button  type="text" size="small" v-if="cus_com_sys1" @click="editOpera(scope.row,1)">管理代理商运营</el-button>
+              <!-- <el-button  type="text" size="small" v-if="cus_com_sys" @click="editOpera(scope.row,0)">系统运营</el-button> -->
+              <el-button  type="text" size="small" v-if="cus_com_sys1" @click="editOpera(scope.row,1)">代理商运营</el-button>
               <!-- <el-button  type="text" size="small"  @click="bindAgent(scope.row)">绑定代理商</el-button> -->
             </template>
           </el-table-column>

src/views/admin/role/index.vue

@@ -4,8 +4,8 @@
     <basic-container>
       <div style="margin-bottom: 20px">
         <el-radio-group v-model="tabselect" size="medium" @change="radioChange">
-          <el-radio-button label="0">业务角色</el-radio-button>
-          <!-- <el-radio-button label="1">公司角色</el-radio-button> -->
+          <el-radio-button label="0">楼盘角色</el-radio-button>
+          <el-radio-button label="1">公司角色</el-radio-button>
           <el-radio-button label="2">代理商角色</el-radio-button>
           <el-radio-button label="3">系统角色</el-radio-button>
           <!-- <el-radio-button label="4">运营角色</el-radio-button> -->
@@ -503,6 +503,7 @@ export default {
       };
       if (this.tabselect == 0 || this.tabselect == 1) {
         obj.orgCode = this.orgCode;
+        this.tabselect == 0?obj.orgType=1:obj.orgType=2
       }
       if (this.tabselect == 2) {
         obj.agentId = this.orgCode;
@@ -578,7 +579,8 @@ export default {
         this.dialogFormVisible = false;
         return;
       }
-      if(this.tabselect==0){
+      if(this.tabselect==0||this.tabselect==1){
+        this.tabselect == 0?this.form.orgType=1:this.form.orgType=2
         this.form.orgCode = this.orgCode;
         this.form.agentId = null;
       }

src/views/building/index.vue

@@ -284,6 +284,7 @@
             <el-radio :label="0">正式</el-radio>
             <el-radio :label="1">试用</el-radio>
             <el-radio :label="2">演示</el-radio>
+            <el-radio :label="3">测试</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="楼盘名称" prop="propertyName">
@@ -699,6 +700,7 @@ export default {
         managerPassword: "", //密码
         provinceId: "", //省id
         cityId: "", //市id
+        agentId:localStorage.getItem('agentId')
       },
       ruleForm1: {},
       optionsagentId:[],
@@ -1016,6 +1018,7 @@ export default {
       this.$api.api
         .getCompanyList({
           orgType: this.orgType,
+          agentId:localStorage.getItem('agentId')
         })
         .then((res) => {
           if (res.code == 0) {

vue.config.js

@@ -7,7 +7,7 @@
 // const url = 'http://192.168.31.169:9999' //长龙
 // const url = 'http://192.168.31.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
-const url = 'http://jw2vzp.natappfree.cc' //王笑
+const url = 'http://zwfakg.natappfree.cc' //王笑
 
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']