init

src/views/Customer/AgentManagement.vue

@@ -403,7 +403,7 @@ export default {
       options: [
         {
           value: "0",
-          label: "服务器内",
+          label: "服务中",
         },
         {
           value: "1",

src/views/Customer/CompanyRecord.vue

@@ -538,7 +538,7 @@ export default {
         if(valid){
           // console.log(valid,this.operaForm);
           this.$api.api.zkoperationrecordSaveCompany({
-            orgType:this.idx==0?'1':'2',
+            orgType:2,
             accountIds:this.operaForm.operationalPeople.join(','),
             orgId: this.operaForm.orgId,
             operationType:this.idx==0?'1':'2'

src/views/admin/user/index.vue

@@ -554,6 +554,25 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <!-- <el-form-item label="身份:"  prop="newRoleId" v-if="formTwo.userRoleType!=6&&formTwo.userRoleType!=7&&formTwo.userRoleType!=8"> -->
+        <el-form-item label="身份:"  prop="newRoleId">
+          <el-select
+            v-model="formTwo.userRoleType"
+            filterable
+            :disabled='formTwo.userRoleType==6||formTwo.userRoleType==7||formTwo.userRoleType==8'
+            value-key="key"
+            style="width: 370px"
+            placeholder="请选择身份"
+          >
+            <el-option
+              v-for="item in userRoleTypeList"
+               :key="item.dictValue"
+              :label="item.dictName"
+              :value="item.dictValue"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="部门:"  prop="deptId" v-if="orgFlag">
           <el-select
             v-model="formTwo.deptId"
@@ -1045,8 +1064,10 @@ export default {
         deptId:'',//部门
         roleId:'',//角色
         newRoleId:"",
-        showPhoneStatus:0//手机号显隐
+        showPhoneStatus:0,//手机号显隐
+        userRoleType:'',
       },
+      userRoleTypeList:[],
       phoneFlag: false,
       rolesOptions: [],
       checkHouse: [],
@@ -1423,11 +1444,13 @@ export default {
       });
     },
     search() {
+      this.page.current1
       console.log(this.searchMsg, "搜索内容1");
       // return
       this.roleList();
     },
     search1() {
+      this.page.current=1
       console.log(this.searchMsg1, "搜索内容2");
       // return
       this.roleList();
@@ -1510,6 +1533,7 @@ export default {
           .then((res) => {
             console.log(res);
             this.houseVisible = false;
+            this.roleList();
           });
       } else {
         // 省市json串
@@ -1565,10 +1589,9 @@ export default {
           .then((res) => {
             console.log(res);
             this.houseVisible = false;
+            this.roleList();
           });
       }
-
-      this.roleList();
     },
     // 楼盘绑定解绑
     // bindhouse(e){
@@ -2125,9 +2148,18 @@ export default {
       this.formTwo.houseId=row.houseId
       this.formTwo.newRoleId=row.roleId
       this.formTwo.deptId=row.deptId
+      this.formTwo.userRoleType=row.userRoleType+''
       console.log(this.formTwo);
       // 获取角色列表
       this.typeChange1(row)
+      this.userDict( 
+        {
+          dictKey:row.orgType,
+          dictType: 3,
+        },
+        "userRoleTypeList"
+      );
+
       // 获取部门列表
       this.dialogFormVisibleTwo=true
     },

src/views/building/index.vue

@@ -640,11 +640,11 @@ export default {
       options1: [
         {
           value: "0",
-          label: "服务器内",
+          label: "服务中",
         },
         {
           value: "1",
-          label: "已失效",
+          label: "已过期",
         },
       ],
       options: [

vue.config.js

@@ -3,11 +3,11 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://pigx-gateway'
-// const url = 'http://39.97.167.65:9999' //测试
+const url = 'http://39.97.167.65:9999' //测试
 // 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://jrcd6b.natappfree.cc' //王笑
+// const url = 'http://jrcd6b.natappfree.cc' //王笑
 
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']