yahyahy 3 anni fa
parent
commit
fdf1ef2985

+ 9 - 0
src/api/system/dept.js

@@ -8,6 +8,15 @@ export function listDept(query) {
     params: query
   })
 }
+// 查询部门列表
+export function listDeptri(query) {
+  return request({
+    url: '/system/dept/treeselect',
+    method: 'get',
+    params: query
+  })
+}
+
 
 // 查询部门列表(排除节点)
 export function listDeptExcludeChild(id) {

+ 2 - 2
src/settings.js

@@ -1,8 +1,8 @@
 module.exports = {
   title: '潜山市防疫数据平台',
   // urls: `http://118.178.139.79:7090`,
-  urls: `http://192.168.101.11:8090`,
-   // urls: `https://qsfy.qs163.cn`,
+  // urls: `http://192.168.101.11:8090`,
+   urls: `https://qsfy.qs163.cn`,
 
   /**
    * 侧边栏主题 深色主题theme-dark,浅色主题theme-light

+ 1 - 1
src/views/system/dept/index.vue

@@ -139,7 +139,7 @@
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
+import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild, listDeptri } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 

+ 4 - 1
src/views/system/role/index.vue

@@ -362,6 +362,7 @@ export default {
     getMenuTreeselect() {
       menuTreeselect().then(response => {
         this.menuOptions = response.data;
+		console.log(this.menuOptions)
       });
     },
     /** 查询部门树结构 */
@@ -491,8 +492,10 @@ export default {
     },
     // 树权限(父子联动)
     handleCheckedTreeConnect(value, type) {
+		
       if (type == 'menu') {
         this.form.menuCheckStrictly = value ? true: false;
+		console.log(value,this.form.menuCheckStrictly)
       } else if (type == 'dept') {
         this.form.deptCheckStrictly = value ? true: false;
       }
@@ -500,7 +503,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      // this.getMenuTreeselect();
+      this.getMenuTreeselect();
       this.open = true;
       this.title = "添加角色";
     },

+ 14 - 3
src/views/system/time/index.vue

@@ -981,9 +981,20 @@ export default {
 			if (this.form.isVaccination !== null) {
 				if (this.form.isVaccination == '是') {
 					// 接种疫苗
-					(this.naneme = false), (this.shouwes = true);
-				} else {
-					(this.naneme = true), (this.shouwes = false);
+					this.naneme = false, 
+					this.shouwes = true;
+				}else {
+					this.naneme = true, 
+					this.shouwes = false,
+					this.form.vaccineInfoUserList = [{
+						vaccineName: '',
+						vaccinationTime: '',
+						vaccinationPlace: '',
+						jici: '',
+						progress: '',
+						url:[]
+					}
+				]
 				}
 			}
 		},