Forráskód Böngészése

完成选宿舍金额设置接口

hzj18279462576@163.com 11 hónapja
szülő
commit
07e025ac45

+ 18 - 0
src/assets/svgs/moneySetting.svg

@@ -0,0 +1,18 @@
+<svg t="1752225173120" class="icon" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3564"
+    width="200" height="200">
+    <path
+        d="M990.72 321.28H33.28c-12.8 0-24.32-8.96-29.44-21.76-2.56-12.8 3.84-26.88 15.36-33.28l481.28-230.4c8.96-3.84 17.92-3.84 24.32 0l476.16 229.12c11.52 6.4 17.92 20.48 15.36 33.28-1.28 14.08-12.8 23.04-25.6 23.04z m-828.16-57.6h701.44L514.56 93.44 162.56 263.68z"
+        p-id="3565"></path>
+    <path
+        d="M832 290.56h57.6v533.76H832V290.56z m-698.88 21.76H192v500.48h-57.6V312.32z m363.52 216.32l-90.88-90.88c-8.96-8.96-8.96-24.32 0-35.84 8.96-8.96 24.32-8.96 35.84 0l90.88 90.88c8.96 8.96 8.96 24.32 0 35.84-8.96 8.96-24.32 8.96-35.84 0z"
+        p-id="3566"></path>
+    <path
+        d="M491.52 528.64c-8.96-8.96-8.96-24.32 0-35.84l90.88-90.88c8.96-8.96 24.32-8.96 35.84 0 8.96 8.96 8.96 24.32 0 35.84l-90.88 90.88c-11.52 8.96-26.88 8.96-35.84 0z"
+        p-id="3567"></path>
+    <path
+        d="M638.72 546.56H385.28c-12.8 0-24.32-11.52-24.32-24.32s11.52-24.32 24.32-24.32h252.16c12.8 0 24.32 11.52 24.32 24.32 1.28 12.8-8.96 24.32-23.04 24.32z m0 102.4H385.28c-12.8 0-24.32-11.52-24.32-24.32s11.52-24.32 24.32-24.32h252.16c12.8 0 24.32 11.52 24.32 24.32 1.28 12.8-8.96 24.32-23.04 24.32z"
+        p-id="3568"></path>
+    <path
+        d="M512 742.4c-12.8 0-24.32-11.52-24.32-24.32V546.56c0-12.8 11.52-24.32 24.32-24.32 12.8 0 24.32 11.52 24.32 24.32V716.8c0 14.08-11.52 25.6-24.32 25.6zM928 872.96h-832c-15.36 0-29.44-12.8-29.44-29.44s12.8-29.44 29.44-29.44h832c15.36 0 29.44 12.8 29.44 29.44s-14.08 29.44-29.44 29.44zM994.56 990.72H29.44c-15.36 0-29.44-12.8-29.44-29.44s12.8-29.44 29.44-29.44h966.4c15.36 0 29.44 12.8 29.44 29.44s-14.08 29.44-30.72 29.44z"
+        p-id="3569"></path>
+</svg>

+ 15 - 0
src/stores/index.js

@@ -179,6 +179,20 @@ export const useCounterStore = defineStore("user", {
             }
           });
         }
+        // 选宿舍金额设置
+        if (roles.dormitoryMoneySetting) {
+          let arr = roles.dormitoryMoneySetting.split(",");
+          arr.forEach((i) => {
+            btn.push(`dormitoryMoneySetting${i}`);
+            if (i == 2) {
+              this.roleList.push({
+                name: "选宿舍金额设置 ",
+                path: "/moneySetting",
+                icon: "moneySetting",
+              });
+            }
+          });
+        }
         // 用户管理
         if (roles.accountManagementSetting) {
           let arr = roles.accountManagementSetting.split(",");
@@ -207,6 +221,7 @@ export const useCounterStore = defineStore("user", {
             }
           });
         }
+        
         // 系统设置
         if (roles.settingManagementSetting) {
           let arr = roles.settingManagementSetting.split(",");

+ 4 - 0
src/views/bed/bed.vue

@@ -2010,6 +2010,10 @@ const projectImportConfirm = async () => {
 };
 const cancelProjectImport = () => {
   buildImportVisible.value = false;
+  if (buildRef.value) {
+    buildRef.value.clearFiles();
+    buildFile.value = null;
+  }
 };
 
 onBeforeMount(() => {

+ 4 - 0
src/views/building/building.vue

@@ -738,6 +738,10 @@ const projectImportConfirm = async () => {
 };
 const cancelProjectImport = () => {
   buildImportVisible.value = false;
+  if (buildRef.value) {
+    buildRef.value.clearFiles();
+    buildFile.value = null;
+  }
 };
 
 onBeforeMount(() => {

+ 4 - 0
src/views/dormitory/dormitory.vue

@@ -1183,6 +1183,10 @@ const projectImportConfirm = async () => {
 };
 const cancelProjectImport = () => {
   buildImportVisible.value = false;
+  if (buildRef.value) {
+    buildRef.value.clearFiles();
+    buildFile.value = null;
+  }
 };
 
 onBeforeMount(() => {

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1007 - 0
src/views/moneySetting/moneySetting.vue


+ 58 - 0
src/views/role/role.vue

@@ -435,6 +435,26 @@
                   />
                 </td>
               </tr>
+               <!-- 选宿舍金额设置 -->
+               <tr align="center">
+                <td>选宿舍金额设置</td>
+                <td>/</td>
+                <td>
+                  <el-tree
+                    ref="addRolesData12"
+                    style="max-width: 600px"
+                    :data="addRolesList12.three"
+                    show-checkbox
+                    node-key="id"
+                    :props="defaultProps"
+                    default-expand-all
+                    @check="
+                      (data, nodes) =>
+                        editMemberCheckChange(data, nodes, addRolesList12.one)
+                    "
+                  />
+                </td>
+              </tr>
               <!-- 用户管理 9 -->
               <tr align="center">
                 <td rowspan="2">权限管理</td>
@@ -475,6 +495,7 @@
                   />
                 </td>
               </tr>
+             
               <!-- 系统设置 11 -->
               <tr align="center">
                 <td rowspan="2">系统设置</td>
@@ -571,6 +592,7 @@ const addRoles = reactive({
   visitorManagementSetting: [], //访客管理设置
   roleManagementSetting: [], //角色管理设置
   accountManagementSetting: [], //用户管理设置
+  dormitoryMoneySetting: [], //选宿舍金额设置
   settingManagementSetting: [], //设置管理设置
 });
 
@@ -799,6 +821,28 @@ const addRolesList10 = reactive({
   checkedSel: [],
 });
 
+const addRolesData12 = ref();
+const addRolesList12 = reactive({
+  one: "选宿舍金额设置",
+  two: "/",
+  three: [
+    {
+      name: "全部",
+      id: 0,
+      children: [
+        { name: "导入", id: 1 },
+        { name: "导出", id: 2 },
+        { name: "新增", id: 3 },
+        { name: "编辑", id: 4 },
+        { name: "删除", id: 5 },
+        { name: "查看页面", id: 6 },
+      ],
+    },
+  ],
+  four: "3",
+  checkedSel: [],
+});
+
 const addRolesData11 = ref();
 const addRolesList11 = reactive({
   one: "系统设置",
@@ -918,6 +962,9 @@ const addRolesClick = () => {
   if (addRolesData10.value) {
     addRolesData10.value.setCheckedKeys([]);
   }
+  if (addRolesData12.value) {
+    addRolesData12.value.setCheckedKeys([]);
+  }
   if (addRolesData11.value) {
     addRolesData11.value.setCheckedKeys([]);
   }
@@ -1007,6 +1054,14 @@ const updateS = async (row) => {
       addRoles.roleManagementSetting = row.roleManagementSetting.split(",");
       addRolesData10.value.setCheckedKeys(row.roleManagementSetting.split(","));
     }
+    // 选宿舍金额设置 12
+    if (addRolesData12.value) {
+      addRoles.dormitoryMoneySetting =
+        row.dormitoryMoneySetting.split(",");
+      addRolesData12.value.setCheckedKeys(
+        row.dormitoryMoneySetting.split(",")
+      );
+    }
 
     // 门锁管理 11
     if (addRolesData11.value) {
@@ -1077,6 +1132,8 @@ const editMemberCheckChange = (data, nodes, name) => {
     addRoles.accountManagementSetting = nodes.checkedKeys;
   } else if (name == "角色管理") {
     addRoles.roleManagementSetting = nodes.checkedKeys;
+  } else if (name == "选宿舍金额设置") {
+    addRoles.dormitoryMoneySetting = nodes.checkedKeys;
   } else if (name == "系统设置") {
     addRoles.settingManagementSetting = nodes.checkedKeys;
   }
@@ -1106,6 +1163,7 @@ const confirmEdit = async () => {
     visitorManagementSetting: addRoles.visitorManagementSetting.join(","),
     roleManagementSetting: addRoles.roleManagementSetting.join(","),
     accountManagementSetting: addRoles.accountManagementSetting.join(","),
+    dormitoryMoneySetting: addRoles.dormitoryMoneySetting.join(","),
     settingManagementSetting: addRoles.settingManagementSetting.join(","),
   };
   if (addRoles.id) {

+ 12 - 7
src/views/studentInfo/studentInfo.vue

@@ -491,12 +491,17 @@
                 clearable
               />
             </el-form-item>
-            <el-form-item label="批次 :" prop="batchValue">
-              <el-input
-                v-model.trim="ruleForm.batchValue"
-                placeholder="请输入批次"
+            <el-form-item label="层次 :" prop="batchValue">
+            
+              <el-select
                 clearable
-              />
+                v-model="ruleForm.batchValue"
+                placeholder="请选择层次"
+              >
+                <el-option label="本科" value="本科" />
+                <el-option label="专升本" value="专升本" />
+                <el-option label="专科" value="专科" />
+              </el-select>
             </el-form-item>
           </div>
         </div>
@@ -1000,7 +1005,7 @@
               <span class="title_content">{{ ruleForm.eduSystem }}</span>
             </div>
             <div class="el-form-item">
-              <span class="title">次 :</span>
+              <span class="title">次 :</span>
               <span class="title_content">{{ ruleForm.batchValue }}</span>
             </div>
           </div>
@@ -1448,7 +1453,7 @@ const rules = reactive({
   name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
   sex: [{ required: true, message: "性别不能为空", trigger: "blur" }],
   eduSystem: [{ required: true, message: "学制不能为空", trigger: "blur" }],
-  batchValue: [{ required: true, message: "次不能为空", trigger: "blur" }],
+  batchValue: [{ required: true, message: "次不能为空", trigger: "blur" }],
   nationality: [{ required: true, message: "民族不能为空", trigger: "blur" }],
 
   phone: [

+ 3 - 3
src/views/system/system.vue

@@ -4,13 +4,12 @@
       <!-- <el-icon :size="23" class="camera"><VideoCameraFilled /></el-icon> -->
       <div class="cameratxt">系统设置</div>
     </div>
-    <div class="system_title">
+    <!-- <div class="system_title">
       <h4>选宿舍缴费设置</h4>
       <span class="wain">(达到设置的缴费金额才支持线上选宿舍操作)</span>
     </div>
     <ul>
       <div class="add">
-        <!-- <SvgIcon name="add" color="#fff" size="22"></SvgIcon>&nbsp;新增 -->
         <div
           v-if="!updateShow"
           @click="payFeesAdd"
@@ -71,7 +70,8 @@
           &nbsp;删除
         </div>
       </li>
-    </ul>
+    </ul> -->
+    
     <!-- <div class="system_title">
       <h4>宿舍开放比例设置</h4>
     </div>