学校组织列表-新增描述

src/common/apiConfig.js

@@ -36,11 +36,11 @@ export const API_CONFIG = {
   },
   //新增学校
   ajax_add_school: {
-    functionName: "insert_school2",
+    functionName: "insert_school3",
   },
   //新增组织
   ajax_add_org: {
-    functionName: "insert_org2",
+    functionName: "insert_org3",
   },
   //确认移动
   ajax_confirm: {

src/components/organList.vue

@@ -21,6 +21,11 @@
                         {{ scope.row.code || '-' }} <!-- 如果 org 为空，显示 '-' -->
                     </template>
                 </el-table-column>
+                <el-table-column show-overflow-tooltip prop="detail" label="描述" min-width="45">
+                    <template slot-scope="scope">
+                        {{ scope.row.detail || '-' }} <!-- 如果 org 为空，显示 '-' -->
+                    </template>
+                </el-table-column>
                 <el-table-column show-overflow-tooltip prop="area" label="区域" min-width="45"></el-table-column>
                 <el-table-column show-overflow-tooltip prop="ctime" label="创建时间" min-width="45"></el-table-column>
                 <el-table-column label="是否禁用/使用期限" min-width="45">
@@ -80,6 +85,18 @@
                             </span>
                         </div>
                     </div>
+                    <!-- 描述 -->
+                    <div class="el-form-item">
+                        <label class="el-form-item__label" style="width: 100px">描述</label>
+                        <div class="el-form-item__content" style="margin-left: 5px">
+                            <span>
+                                <div class="add_input el-input el-input--suffix">
+                                    <input v-model="orgDetail" type="text" autocomplete="off" placeholder="请输入描述"
+                                        class="el-input__inner" />
+                                </div>
+                            </span>
+                        </div>
+                    </div>
                     <!-- 区域 -->
                     <div class="el-form-item">
                         <label class="el-form-item__label" style="width: 100px">区域</label>
@@ -101,7 +118,7 @@
                 </form>
             </div>
             <!-- 按钮区域 -->
-            <div slot="footer" class="dialog-footer">
+            <div slot="footer" class="el-dialog__footer" style="margin-top: 88px;">
                 <el-button @click="close_add_organ">取 消</el-button>
                 <el-button type="primary" @click="ajax_add_org">确认</el-button>
             </div>
@@ -134,6 +151,18 @@
                                 </div>
                             </span>
                         </div>
+                    </div>
+                     <!-- 描述 -->
+                     <div class="el-form-item">
+                        <label class="el-form-item__label" style="width: 100px">描述</label>
+                        <div class="el-form-item__content" style="margin-left: 5px">
+                            <span>
+                                <div class="add_input el-input el-input--suffix">
+                                    <input v-model="orgDetail" type="text" autocomplete="off" placeholder="请输入描述"
+                                        class="el-input__inner" />
+                                </div>
+                            </span>
+                        </div>
                     </div>
                     <!-- 区域 -->
                     <div class="el-form-item">
@@ -141,14 +170,12 @@
                         <div class="el-form-item__content" style="margin-left: 5px">
                             <span>
                                 <div class="add_input el-input el-input--suffix">
-
                                     <el-select v-model="regionC" placeholder="请选择区域" class="custom-select" filterable>
                                         <el-option v-for="(org, index) in regionCList" :key="index" :label="org.name"
                                             :value="org.name">
                                             {{ org.name }}
                                         </el-option>
                                     </el-select>
-
                                 </div>
                             </span>
                         </div>
@@ -156,7 +183,7 @@
                 </form>
             </div>
             <!-- 按钮区域 -->
-            <div slot="footer" class="dialog-footer">
+            <div slot="footer" class="el-dialog__footer" style="margin-top: 88px;">
                 <el-button @click="close_add_organ2">取 消</el-button>
                 <el-button type="primary" @click="updateOrgan">确认</el-button>
             </div>
@@ -210,6 +237,7 @@ export default {
             useDate: "",
             orgName: "",
             randomCode: "",
+            orgDetail: "",
             regionC: 'cn',
             uLogin: "1", // 登录状态 (1 或 2)
             radio: "1",
@@ -305,6 +333,9 @@ export default {
         },
         //修改学校关闭
         close_add_organ2() {
+            this.orgName = "";
+            this.randomCode = "";
+            this.orgDetail = "";
             this.regionC = 'cn'
             this.add_organ_dialog2 = false;
         },
@@ -331,6 +362,7 @@ export default {
                     u_name: orgName, // 组织名称
                     u_create: this.userid, // u_create 固定为0
                     u_code: randomCode, // 随机码（可以为空）
+                    u_detail: this.orgDetail, // 描述
                     u_regionC: this.regionC,
                     u_login: uLogin, // 登录状态
                 },
@@ -370,6 +402,7 @@ export default {
                     this.add_organ_dialog = false;
                     // 清空输入框、下拉菜单选择和单选框
                     this.orgName = ""; // 清空学校名称
+                    this.orgDetail = ""; // 清空学校描述
                     this.regionC = 'cn'
                     this.randomCode = ""; // 清空地区选择
                     this.uLogin = "1"; // 清空学校类型选择
@@ -386,17 +419,18 @@ export default {
             this.orgName = row.name;
             this.randomCode = row.code;
             this.regionC = row.area;
+            this.orgDetail = row.detail;
             console.log(row);
         },
         updateOrgan() {
             let params = [
                 {
-                    functionName: "updateOrgan",
+                    functionName: "updateOrgan2",
                     id: this.nid,
                     name: this.orgName,
                     code: this.randomCode,
+                    detail: this.orgDetail,
                     area: this.regionC
-
                 }
             ];
             this.$ajax
@@ -431,14 +465,14 @@ export default {
             this.useDate = `${year}-${month}-${day}`; // 返回格式化后的日期字符串
         },
         enable(row) {
-            if(row.isLogin === '2'){
+            if (row.isLogin === '2') {
                 this.enable_organ_dialog = true;
                 this.nid = row.id;
             }
-            else{
+            else {
                 this.disableOrgan(row);
             }
-            
+
 
         },
         enable_organ() {

src/components/schoolList.vue

@@ -37,6 +37,11 @@
 						<!-- 如果 org 为空，显示 '-' -->
 					</template>
 				</el-table-column>
+				<el-table-column show-overflow-tooltip prop="detail" label="描述" min-width="45">
+					<template slot-scope="scope">
+                        {{ scope.row.detail || '-' }} <!-- 如果 org 为空，显示 '-' -->
+                    </template>
+				</el-table-column>
 				<el-table-column show-overflow-tooltip prop="area" label="区域" min-width="45"></el-table-column>
 				<el-table-column show-overflow-tooltip prop="ctime" label="创建时间" min-width="45"></el-table-column>
 				<el-table-column label="是否禁用/使用期限" min-width="45">
@@ -127,7 +132,18 @@
 							</span>
 						</div>
 					</div>
-
+					<!-- 描述 -->
+					<div class="el-form-item">
+						<label class="el-form-item__label" style="width: 100px">描述</label>
+						<div class="el-form-item__content" style="margin-left: 5px">
+							<span>
+								<div class="add_input el-input el-input--suffix">
+									<input v-model="schoolDetail" type="text" autocomplete="off" placeholder="请输入描述"
+										class="el-input__inner" />
+								</div>
+							</span>
+						</div>
+					</div>
 					<!-- 区域 -->
 					<div class="el-form-item">
 						<label class="el-form-item__label" style="width: 100px">区域</label>
@@ -211,7 +227,18 @@
 							</span>
 						</div>
 					</div>
-
+					<!-- 描述 -->
+					<div class="el-form-item">
+						<label class="el-form-item__label" style="width: 100px">描述</label>
+						<div class="el-form-item__content" style="margin-left: 5px">
+							<span>
+								<div class="add_input el-input el-input--suffix">
+									<input v-model="schoolDetail" type="text" autocomplete="off" placeholder="请输入描述"
+										class="el-input__inner" />
+								</div>
+							</span>
+						</div>
+					</div>
 					<!-- 区域 -->
 					<div class="el-form-item">
 						<label class="el-form-item__label" style="width: 100px">区域</label>
@@ -304,6 +331,7 @@ export default {
 				{ id: 2, name: "cn" },
 			], //区域列表
 			organizations: [],
+			schoolDetail: "", //学校描述
 			schoolType: "1", //学校单选框类型
 			loginPermission: "1", //是否允许登录
 			nid: "", //修改学校的id
@@ -413,6 +441,7 @@ export default {
 			this.regionC = "cn";
 			this.schoolType = "1"; // 清空学校类型选择
 			this.schoolCode = ""; // 清空学校编码
+			this.schoolDetail = ""; // 清空学校描述
 			this.loginPermission = "1"; // 清空登录权限的选择
 		},
 		close_enable_school() {
@@ -455,6 +484,7 @@ export default {
 					u_dest: this.region || "", // 地区，绑定到 region，如果为空则传空字符串
 					u_type: this.schoolType || "", // 学校类型，绑定到 schoolType，如果没有选择则为空
 					u_code: this.schoolCode || "", // 学校编码，绑定到 schoolCode，如果为空则传空字符串
+					u_detail: this.schoolDetail || "", // 学校描述，绑定到 schoolDetail，如果为空则传空字符串
 					u_regionC: this.regionC || "",
 					u_isLogin: this.loginPermission === "1" ? 1 : 2, // 是否允许登录，默认传 2（不允许登录）如果没有选择
 					uid: this.userid,
@@ -496,6 +526,7 @@ export default {
 					this.sch_name = ""; // 清空学校名称
 					this.school.parentOrgId = ""; // 清空组织选择
 					this.region = ""; // 清空地区选择
+					this.schoolDetail = ""; // 清空学校描述
 					this.regionC = "cn";
 					this.schoolType = "1"; // 清空学校类型选择
 					this.schoolCode = ""; // 清空学校编码
@@ -513,17 +544,19 @@ export default {
 			this.school.parentOrgId = row.org;
 			this.region = row.dest;
 			this.schoolCode = row.code;
+			this.schoolDetail = row.detail;
 			this.regionC = row.area;
 		},
 		updateSchool() {
 			let params = [
 				{
-					functionName: "updateSchool",
+					functionName: "updateSchool2",
 					id: this.nid,
 					name: this.sch_name,
 					dest: this.region,
 					code: this.schoolCode,
 					organ: this.school.parentOrgId,
+					detail: this.schoolDetail,
 					area: this.regionC,
 				},
 			];