#

src/components/examine.vue

@@ -81,10 +81,10 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">{{
-                scope.row.orgName ? scope.row.orgName : "-"
+                scope.row.orgname ? scope.row.orgname : "-"
               }}</template>
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               label="学校名字"
               min-width="45"
               show-overflow-tooltip
@@ -92,7 +92,7 @@
               <template slot-scope="scope">{{
                 scope.row.schoolName ? scope.row.schoolName : "-"
               }}</template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               show-overflow-tooltip
               prop="contact_info"
@@ -106,20 +106,30 @@
               show-overflow-tooltip
               :label-class-name="'address-column'"
             ></el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="username"
               label="账号"
               min-width="45"
               show-overflow-tooltip
               :label-class-name="'address-column'"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               prop="time"
               label="提交时间"
              width="180px"
               sortable="custom"
             ></el-table-column>
-           <el-table-column
+          
+            
+            
+
+            <el-table-column
+              prop="remark"
+              label="备注"
+              min-width="45"
+            ></el-table-column>
+
+            <el-table-column
               prop="utime"
               label="审核时间"
               width="180px"
@@ -127,22 +137,27 @@
               v-if="type !== 0"
             >
               <template slot-scope="scope">{{scope.row.utime ? scope.row.utime : '-'}}</template>
-              </el-table-column>
-            <el-table-column label="状态" min-width="45">
-              <template slot-scope="scope">{{
-                getStatusText(scope.row.type)
-              }}</template>
             </el-table-column>
+
             <el-table-column
-              prop="remarks"
-              label="备注"
+              label="开通组织"
               min-width="45"
-            ></el-table-column>
-            <el-table-column label="操作" width="150px" v-if="type == 0 || type == 2">
-              <template slot-scope="{ row }">
+              v-if="type == 1"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">{{
+                scope.row.orgName ? scope.row.orgName : "-"
+              }}</template>
+            </el-table-column>
+
+            <el-table-column 
+              label="操作" 
+              width="150px" 
+              v-if="type == 0 || type == 2">
+              <template slot-scope="scope">
                 <button
-                  v-if="type == 0"
-                  @click="ajax_move_user(1, row)"
+                  v-if="scope.row.type == 0 "
+                  @click="ajax_move_user(1, scope.row)"
                   style="
                     color: #308fff;
                     background: none;
@@ -154,8 +169,8 @@
                   通过
                 </button>
                 <button
-                  v-if="type == 0"
-                  @click="ajax_move_user(2, row)"
+                  v-if="scope.row.type == 0 "
+                  @click="ajax_move_user(2, scope.row)"
                   style="
                     color: #ff2570;
                     background: none;
@@ -167,8 +182,8 @@
                   忽略
                 </button>
                 <button
-                  v-if="type == 2"
-                  @click="ajax_move_user(0, row)"
+                  v-if="scope.row.type == 2"
+                  @click="ajax_move_user(0, scope.row)"
                   style="
                     color: #308fff;
                     background: none;
@@ -181,6 +196,15 @@
                 </button>
               </template>
             </el-table-column>
+
+            <el-table-column 
+              label="状态" 
+              v-if="type == 3"
+              min-width="45">
+              <template slot-scope="scope">
+                {{ getStatusText(scope.row.type) }}
+              </template>
+            </el-table-column>
           </el-table>
         </div>
         <!-- 学习名称组织名称表单区域 -->
@@ -240,7 +264,7 @@
                       type="radio"
                       class="checkbox_input_org"
                       name="school_selection"
-                      :value="school.id"
+                      :value="school"
                       v-model="selectedSchool"
                     />
                   </div>
@@ -461,7 +485,7 @@ export default {
       cn_org: true,
       searchQuery: "", // 用来存储输入框的值
       // 用来存储选中的学校名称
-      selectedSchool: "",
+      selectedSchool: {},
       // 用于存放从后台获取的组织数据
       organizations: [],
       cn_school: [],// 用于存放从后台获取的学校数据
@@ -567,6 +591,10 @@ export default {
     ...mapGetters(["userid"]),
   },
   methods: {
+    //新增组织关闭
+    close_add_org() {
+      this.add_org_dialog = false;
+    },
     //组织查询
     ajax_org() {
       const params = [API_CONFIG.ajax_org]; // 使用配置中的接口参数
@@ -715,12 +743,13 @@ export default {
     },
     //组织下拉菜单查询
     ajax_org_check() {
-      this.selectedSchool = "";
+      this.selectedSchool = {};
     },
     // 移动关闭按钮
     close_table() {
       this.isOrgFormVisible = false;
-      this.selectedSchool = '';
+      this.selectedSchool = {};
+
       // 清空输入框、下拉菜单选择和单选框
       this.sch_name = ""; // 清空学校名称
       this.school.parentOrgId = ""; // 清空组织选择
@@ -861,7 +890,8 @@ export default {
             const params = [{
               functionName: API_CONFIG.moveUser.functionName,
               uid: row.id,
-              oid:  this.selectedSchool,
+              org: this.selectedSchool.org,
+              oid:  this.selectedSchool.id,
               type: requestType,
               euid: this.userid,
             }];
@@ -870,7 +900,8 @@ export default {
               const res = await this.$ajax.post(API_CONFIG.baseUrl, params);
               console.log(res);
               if (type === 1) {
-                row.oid =  this.selectedSchool
+                row.oid =  this.selectedSchool.id
+                row.orgid =  this.selectedSchool.org
 
                 await this.addUser(row);
               } else {
@@ -909,7 +940,10 @@ export default {
       let string = "";
       if (type == 1) {
         if (row.type == 1) return
-        if (!row.oid && !this.selectedSchool) {
+        // console.log(JSON.stringify(this.selectedSchool) === '{}');
+        // console.log(JSON.stringify(this.selectedSchool));
+
+        if (!row.oid && JSON.stringify(this.selectedSchool) === '{}') {
           this.addBtn = 0
           return this.isOrgFormVisible = true
         }
@@ -933,7 +967,8 @@ export default {
             {
               functionName: API_CONFIG.moveUser.functionName, // 这里是将数据移至已忽略状态的操作,使用配置中的存储过程名称
               uid: row.id,
-              oid:  this.selectedSchool,
+              org: this.selectedSchool.org,
+              oid:  this.selectedSchool.id,
               type: _type,
               euid: this.userid,
             },
@@ -945,7 +980,9 @@ export default {
             .then((res) => {
               console.log(res);
               if (type == 1) {
-                row.oid =  this.selectedSchool
+                row.oid =  this.selectedSchool.id
+                row.orgid =  this.selectedSchool.org
+
                 this.addUser(row);
               } else {
                 this.$message({

src/views/examineDialog.vue

@@ -15,7 +15,13 @@
                   alt="字符"
                   class="search-icon2"
                 />组织名称 </span>
-              <el-select
+                <input
+                  v-model="orgName"
+                  type="text"
+                  placeholder="请输入组织名称"
+                  class="input"
+                />
+              <!-- <el-select
                 v-loading="orgLoading"
                 v-model="orgName"
                 placeholder="请选择组织名称"
@@ -32,7 +38,7 @@
                 >
                   {{ org.name }}
                 </el-option>
-              </el-select>
+              </el-select> -->
             </div>
 
             <!-- <div class="dialog-content-item-content1">
@@ -171,10 +177,6 @@ export default {
         return;
       }
 
-      let orgC= this.orgs.find((item)=> {
-        return (item.id == this.orgName);
-      });
-
       // if (!this.schoolName) {
       //   this.$message.error("学校选择不能为空");
       //   return;
@@ -201,7 +203,6 @@ export default {
         {
           functionName: "addExamineUser2",
           org: this.orgName,
-          orgCn: orgC.name,
           un: this.Name,
           usern: this.username,
           phone: this.phonenumber,