luojun 1 vuosi sitten
vanhempi
commit
994064b134
1 muutettua tiedostoa jossa 190 lisäystä ja 175 poistoa
  1. 190 175
      src/views/system/dept/index.vue

+ 190 - 175
src/views/system/dept/index.vue

@@ -9,128 +9,137 @@
           @checkChange="checkChange"
           @click="handleNodeClick"
         ></org-tree>
-       </el-col>
-        <!--用户数据-->
-       <el-col :span="20" :xs="24">
-         <div class="main-right-box">
-           <!--    搜索条件    -->
-           <div class="main-search-box">
-             <el-form
-               :model="queryParams"
-               ref="queryForm"
-               size="small"
-               :inline="true"
-               v-show="showSearch"
-             >
-               <el-form-item label="机构名称" prop="name" >
-                 <el-input
-                   v-model="queryParams.name"
-                   placeholder="请输入机构名称"
-                   clearable
-                   @keyup.enter.native="handleQuery"
-                   maxlength="50" @input="inputRestriction"
-                 />
-               </el-form-item>
-               <el-form-item label="机构编码" prop="code">
-                 <el-input
-                   v-model="queryParams.code"
-                   placeholder="请输入机构编码"
-                   clearable
-                   @keyup.enter.native="handleQuery"
-                 />
-               </el-form-item>
-               <el-form-item label="机构类型" prop="type">
-                 <el-select
-                   v-model="queryParams.type"
-                   placeholder="请选择机构类型"
-                   clearable
-                 >
-                   <el-option
-                     v-for="dict in dict.type.sys_org_type"
-                     :key="dict.value"
-                     :label="dict.label"
-                     :value="dict.value"
-                   />
-                 </el-select>
-               </el-form-item>
-               <el-form-item label="机构状态" prop="isLock">
-                 <el-select
-                   v-model="queryParams.isLock"
-                   placeholder="请选择机构状态"
-                   clearable
-                 >
-                   <el-option
-                     v-for="dict in dict.type.sys_normal_disable"
-                     :key="dict.value"
-                     :label="dict.label"
-                     :value="dict.value"
-                   />
-                 </el-select>
-               </el-form-item>
-             </el-form>
-             <el-row :gutter="10">
-               <el-col :span="1.5">
-                 <el-button
-                   type="primary"
-                   icon="el-icon-search"
-                   size="mini"
-                   @click="handleQuery"
-                 >搜索</el-button
-                 >
-               </el-col>
-               <el-col :span="1.5">
-                 <el-button
-                   type="primary"
-                   icon="el-icon-refresh"
-                   size="mini"
-                   @click="resetQuery"
-                 >重置</el-button
-                 >
-               </el-col>
-               <el-col :span="1.5">
-                 <el-button
-                   type="primary"
-                   icon="el-icon-plus"
-                   size="mini"
-                   @click="handleAdd"
-                   v-hasPermi="['system:dept:add']"
-                 >新增机构</el-button
-                 >
-               </el-col>
-               <right-toolbar
-                 :showSearch.sync="showSearch"
-                 @queryTable="getList"
-               ></right-toolbar>
-             </el-row>
-           </div>
-           <el-table
-             border
-             height="646"
-             size="small"
-             v-loading="loading"
-             :data="deptList">
-             <el-table-column label="序号" align="center" width="80">
-               <template v-slot:default="scope">
-                 <span v-text="getPageIndex(scope.$index)"> </span>
-               </template>
-             </el-table-column>
-             <el-table-column v-if="false"
-                              prop="name"
-                              label="机构名称"
-             ></el-table-column>
-             <el-table-column align="center"
-               prop="shortName"
-               label="机构简称"
-             ></el-table-column>
-             <el-table-column align="center" prop="type" label="机构类型">
-               <template v-slot="scope">
-                 <dict-tag
-                   :options="dict.type.sys_org_type"
-                   :value="scope.row.type"
-                 />
-               </template>
-             </el-table-column>
-             <el-table-column  prop="code" align="center" label="机构编码"></el-table-column>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="20" :xs="24">
+        <div class="main-right-box">
+          <!--    搜索条件    -->
+          <div class="main-search-box">
+            <el-form
+              :model="queryParams"
+              ref="queryForm"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+            >
+              <el-form-item label="机构名称" prop="name">
+                <el-input
+                  v-model="queryParams.name"
+                  placeholder="请输入机构名称"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                  maxlength="50"
+                  @input="inputRestriction"
+                />
+              </el-form-item>
+              <el-form-item label="机构编码" prop="code">
+                <el-input
+                  v-model="queryParams.code"
+                  placeholder="请输入机构编码"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                  maxlength="50"
+                />
+              </el-form-item>
+              <el-form-item label="机构类型" prop="type">
+                <el-select
+                  v-model="queryParams.type"
+                  placeholder="请选择机构类型"
+                  clearable
+                >
+                  <el-option
+                    v-for="dict in dict.type.sys_org_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="机构状态" prop="isLock">
+                <el-select
+                  v-model="queryParams.isLock"
+                  placeholder="请选择机构状态"
+                  clearable
+                >
+                  <el-option
+                    v-for="dict in dict.type.sys_normal_disable"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <el-row :gutter="10">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="handleQuery"
+                  >搜索</el-button
+                >
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  >重置</el-button
+                >
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="['system:dept:add']"
+                  >新增机构</el-button
+                >
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+              ></right-toolbar>
+            </el-row>
+          </div>
+          <el-table
+            border
+            height="646"
+            size="small"
+            v-loading="loading"
+            :data="deptList"
+          >
+            <el-table-column label="序号" align="center" width="80">
+              <template v-slot:default="scope">
+                <span v-text="getPageIndex(scope.$index)"> </span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="false"
+              prop="name"
+              label="机构名称"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              prop="shortName"
+              label="机构简称"
+            ></el-table-column>
+            <el-table-column align="center" prop="type" label="机构类型">
+              <template v-slot="scope">
+                <dict-tag
+                  :options="dict.type.sys_org_type"
+                  :value="scope.row.type"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="code"
+              align="center"
+              label="机构编码"
+            ></el-table-column>
 
             <el-table-column prop="isLock" align="center" label="机构状态">
               <template v-slot="scope">
@@ -163,24 +172,26 @@
                <span v-text="scope.row.managerPhone"> </span>
              </template>
            </el-table-column> -->
-             <el-table-column  v-if="false"
-                               align="center"
-                               prop="manager"
-                               label="负责人"
-             ></el-table-column>
-             <el-table-column v-if="false"
-                              align="center"
-                              prop="managerPhone"
-                              label="负责人电话"
-             ></el-table-column>
-             <el-table-column
-               label="操作"
-               align="left"
-               width="280"
-               class-name="small-padding fixed-width"
-             >
-               <template slot-scope="scope">
-                 <!-- <router-link
+            <el-table-column
+              v-if="false"
+              align="center"
+              prop="manager"
+              label="负责人"
+            ></el-table-column>
+            <el-table-column
+              v-if="false"
+              align="center"
+              prop="managerPhone"
+              label="负责人电话"
+            ></el-table-column>
+            <el-table-column
+              label="操作"
+              align="left"
+              width="280"
+              class-name="small-padding fixed-width"
+            >
+              <template slot-scope="scope">
+                <!-- <router-link
                    :to="'/system/dept-extend/extend/' + scope.row.id"
                    class="link-type"
                  > -->
@@ -190,40 +201,41 @@
                     scope.row.type == 10 ||
                     scope.row.type == 5
                   "
-                   size="mini"
-                   type="text"
-                   icon="el-icon-plus"
-                   v-hasPermi="['system:dept:extend']"
-                   @click="handleReplenish(scope.row.id)"
-                 >补充信息</el-button
-                 >
-                 <el-button
-                   size="mini"
-                   type="text"
-                   icon="el-icon-edit-outline"
-                   @click="handleUpdate(scope.row)"
-                   v-hasPermi="['system:dept:edit']"
-                 >编辑</el-button>
-                 <el-button
-                   v-if="!scope.row.source"
-                   size="mini"
-                   type="text"
-                   icon="el-icon-delete"
-                   @click="handleDelete(scope.row)"
-                   v-hasPermi="['system:dept:remove']"
-                 >删除</el-button
-                 >
-               </template>
-             </el-table-column>
-           </el-table>
-           <pagination
-             :total="total"
-             :page.sync="queryParams.pageNum"
-             :limit.sync="queryParams.pageSize"
-             @pagination="getList"
-           />
-         </div>
-       </el-col>
+                  size="mini"
+                  type="text"
+                  icon="el-icon-plus"
+                  v-hasPermi="['system:dept:extend']"
+                  @click="handleReplenish(scope.row.id)"
+                  >补充信息</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit-outline"
+                  @click="handleUpdate(scope.row)"
+                  v-hasPermi="['system:dept:edit']"
+                  >编辑</el-button
+                >
+                <el-button
+                  v-if="!scope.row.source"
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="['system:dept:remove']"
+                  >删除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
+      </el-col>
     </el-row>
 
     <!-- 添加或修改机构对话框 -->
@@ -243,11 +255,12 @@
               prop="parentId"
             >
               <treeselect
+              noResultsText="暂无符合条件的数据"
+              clearValueText="清除"
                 v-model="form.parentId"
                 :options="deptOptions2"
                 :normalizer="tenantIdnormalizer"
                 placeholder="请选择所属机构"
-                
               />
             </el-form-item>
           </el-col>
@@ -586,7 +599,9 @@ export default {
       listDept(this.queryParams).then((response) => {
         this.deptList = response.rows;
         this.total = response.total;
+
         this.loading = false;
+        this.queryParams.pageNum = 1;
       });
     },
     /** 转换机构数据结构 */