init

src/api/admin/menu.js

@@ -24,6 +24,13 @@ export function fetchMenuTree(lazy, parentId) {
     params: {lazy: lazy, parentId: parentId}
   })
 }
+export function fetchMenuTree2(lazy, parentId) {
+  return request({
+    url: '/admin/menu/apiTree',
+    method: 'get',
+    params: {lazy: lazy, parentId: parentId}
+  })
+}
 
 export function addObj(obj) {
   return request({

src/api/admin/role.js

@@ -80,9 +80,26 @@ export function permissionUpd(roleId, menuIds) {
   })
 }
 
+export function papiMenuUpd(roleId, menuIds) {
+  return request({
+    url: '/admin/role/apiMenu',
+    method: 'put',
+    data: {
+      roleId: roleId,
+      menuIds: menuIds
+    }
+  })
+}
+
 export function fetchRoleTree(roleId) {
   return request({
     url: '/admin/menu/tree/' + roleId,
     method: 'get'
   })
 }
+export function fetchRoleTree2(roleId) {
+  return request({
+    url: '/admin/menu/apiTree/' + roleId,
+    method: 'get'
+  })
+}

src/api/modules/http.js

@@ -323,7 +323,7 @@ export function templategeaddTemplate(data) {
 //销讲词模板
 export function templategetMarketingTree(query) {
   return request({
-    url: '/autoSR/marketing/getMarketingTree',
+    url: '/autoSR/marketing/getSystemDefault',
     method:'get',
     params:query
   })
@@ -815,3 +815,13 @@ export function keyWordsMatching(obj) {
   })
 }
 
+
+//小程序权限
+export function geTmenu(query) {
+  return request({
+    url: '/admin/menu/apiTree',
+    method: 'get',
+    params:query
+  })
+}
+

src/views/Customer/AgentManagement.vue

@@ -570,7 +570,7 @@ export default {
             { validator: validatePass, trigger: "blur" },
           ],
           managerPassword: [
-           { required: true, message: "请填写密码", trigger: "change" },
+           { required: true, message: "请填写密码", trigger: "blur" },
           { min: 6, max: 18, message: '请输入6~18位，数字或字母组合的密码', trigger: 'blur' }
           ],
           linkmanPhone: [

src/views/Customer/CompanyRecord.vue

@@ -479,7 +479,7 @@ export default {
              { validator: validatePass, trigger: "blur" },
           ],
         managerPassword: [
-          { required: true, message: "请填写密码", trigger: "change" },
+          { required: true, message: "请填写密码", trigger: "blur" },
           { min: 6, max: 18, message: '请输入6~18位，数字或字母组合的密码', trigger: 'blur' }
         ],
       },

src/views/Statistics/ReceptionStatistical.vue

@@ -509,6 +509,7 @@ export default {
       this.statDateStart = "";
       this.statDateEnd = "";
       this.dateType = index;
+      this.customtime=[];
       this.init();
     },
     dealData(arr) {

src/views/Statistics/TrendAnalysis.vue

@@ -77,7 +77,7 @@
         <div class="shang">
           <div class="zuo">
             <div class="text1">有效接待</div>
-            <div class="text2">{{cardobj.startSumCustomer||0}}个</div>
+            <div class="text2">{{cardobj.startSumCustomer||0}}次</div>
           </div>
           <div class="you">
             <img class="youimg" src="/img/waves1.png" alt="" />

src/views/Statistics/houseDataSys.vue

@@ -278,14 +278,12 @@ export default {
     },
     getChars(idx) {
       if (!this.selectTime1) {
-        // console.log(idx);
         let Strname = [];
         let timeDate = [];
         let arr1 = [];
         // 判断是第几个然后对数据进行渲染
         // 先处理时间
         // console.log(timeDate);
-        console.log();
         if (idx == 1) {
           Strname = ["活跃楼盘数"];
           this.compare.activeHouseQuantityList.map((item) => {

src/views/admin/role/index.vue

@@ -182,6 +182,14 @@
                   @click="handlePermission(scope.row)"
                   >权限
                 </el-button>
+                <el-button
+                  v-if="roleManager_btn_perm"
+                  type="text"
+                  size="small"
+                  icon="el-icon-plus"
+                  @click="geTmenu(scope.row)"
+                  >小程序权限
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -320,6 +328,37 @@
         >
       </div>
     </el-dialog>
+
+     <el-dialog
+      :visible.sync="geTmenuListisshow"
+      :close-on-click-modal="false"
+      title="小程序权限"
+    >
+      <div class="dialog-main-tree">
+        <el-tree
+          ref="menuTree"
+          :data="geTmenuList"
+          :default-checked-keys="checkedKeys2"
+          :check-strictly="false"
+          :props="defaultProps9"
+          :filter-node-method="filterNode"
+          class="filter-tree"
+          node-key="id"
+          highlight-current
+          show-checkbox
+        />
+        <!-- default-expand-all -->
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" size="small" @click="updatePermession2(roleId2)"
+          >更 新
+        </el-button>
+        <el-button type="default" size="small" @click="cancal()"
+          >取消</el-button
+        >
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -329,12 +368,14 @@ import {
   delObj,
   fetchList,
   fetchRoleTree,
+  fetchRoleTree2,
   permissionUpd,
+  papiMenuUpd,
   putObj,
 } from "@/api/admin/role";
 import { tableOption } from "@/const/crud/admin/role";
 import { fetchTree } from "@/api/admin/dept";
-import { fetchMenuTree } from "@/api/admin/menu";
+import { fetchMenuTree, fetchMenuTree2} from "@/api/admin/menu";
 import { mapGetters } from "vuex";
 
 export default {
@@ -414,6 +455,19 @@ export default {
       roleManager_btn_edit: false,
       roleManager_btn_del: false,
       roleManager_btn_perm: false,
+
+
+      geTmenuList:[],
+      geTmenuListisshow:false,
+      checkedKeys2:[],
+      defaultProps9: {
+        label: "name",
+        value: "id",
+      },
+      roleId2:'',
+      roleCode2:'',
+      menuIds2:''
+
     };
   },
   async created() {
@@ -433,6 +487,36 @@ export default {
     ...mapGetters(["elements", "permissions"]),
   },
   methods: {
+    geTmenu(row){
+        fetchRoleTree2(row.roleId).then((response) => {
+          this.checkedKeys2 = response.data;
+          return fetchMenuTree2();
+        }).then((response) => {
+          this.geTmenuList = response.data;
+          console.log(this.geTmenuList,'55555555555')
+          // 解析出所有的太监节点
+          this.checkedKeys2 = this.resolveAllEunuchNodeId(
+            this.geTmenuList,
+            this.checkedKeys2,
+            []
+          );
+          this.geTmenuListisshow = true;
+          this.roleId2 = row.roleId;
+          this.roleCode2 = row.roleCode;
+        });
+    },
+    updatePermession2(roleId) {
+      this.menuIds2 = "";
+      this.menuIds2 = this.$refs.menuTree
+        .getCheckedKeys()
+        .join(",")
+        .concat(",")
+        .concat(this.$refs.menuTree.getHalfCheckedKeys().join(","));
+      papiMenuUpd(roleId, this.menuIds2).then(() => {
+        this.geTmenuListisshow = false;
+        this.$notify.success("修改成功");
+      });
+    },
     // 单选框改变
     radioChange(e) {
       // console.log(e)
@@ -662,14 +746,13 @@ export default {
     },
     cancal() {
       this.dialogPermissionVisible = false;
+      this.geTmenuListisshow=false;
     },
     handlePermission(row) {
-      fetchRoleTree(row.roleId)
-        .then((response) => {
+      fetchRoleTree(row.roleId).then((response) => {
           this.checkedKeys = response.data;
           return fetchMenuTree();
-        })
-        .then((response) => {
+        }).then((response) => {
           this.treeData = response.data;
           // 解析出所有的太监节点
           this.checkedKeys = this.resolveAllEunuchNodeId(

src/views/building/area.vue

@@ -262,7 +262,8 @@ export default {
         url: `/autoSR/zkorg/findMyOrg`,
         method: "get",
         params: {
-          orgType: 0,
+          orgType: localStorage.getItem("orgType"),
+          orgCode:localStorage.getItem('orgCode')
         },
       }).then((res) => {
         if (res.code == 0) {

src/views/building/index.vue

@@ -701,7 +701,7 @@ export default {
           { required: true, message: "请填写楼盘名称", trigger: "change" },
         ],
         managerPassword: [
-          { required: true, message: "请填写密码", trigger: "change" },
+          { required: true, message: "请填写密码", trigger: "blur" },
           { min: 6, max: 18, message: '请输入6~18位，数字或字母组合的密码', trigger: 'blur' }
         ],
         startWorking: [

vue.config.js

@@ -3,9 +3,9 @@
  * 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.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 // const url = 'http://nitu5e.natappfree.cc' //王笑