Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/check/dialog.edit.vue

@@ -264,8 +264,9 @@
           style="width: 100%;margin-top: 15px;"
           height="400px"
           @selection-change="handleSelectionChange"
+          
         >
-          <el-table-column type="selection"></el-table-column>
+          <el-table-column type="selection" :selectable="handleSelectable"></el-table-column>
           <el-table-column label="是否扫描">
             <template v-slot="{ row }">
               <el-switch
@@ -407,6 +408,10 @@ export default {
     ...mapGetters(["orgId", "orgName"]),
   },
   methods: {
+    handleSelectable(row) {
+      // 在这里根据特定条件判断是否禁用多选框行
+      return this.getshenglianshe(row); // 返回 true 禁用，返回 false 不禁用
+    },
     // 监听行选中事件，将选中的行数据存入 selectedRows 数组中
     handleSelectionChange(selection) {
       // console.log(selection, "selection");

src/views/core/drill/drillDictionary/index.vue

@@ -7,7 +7,7 @@
                   @click="clickTreeNode" wholeTree></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
           <!-- <el-form-item label="编号" prop="id">
             <el-input v-model="queryParams.id" placeholder="请输入编号" clearable
                       @keyup.enter.native="handleQuery"/>
@@ -64,14 +64,14 @@
 
         <el-table border height="555px" v-loading="loading" :data="drillDictionaryList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" type="index" align="center" width="60"/>
-          <el-table-column label="机构名称" align="left" header-align="center" prop="orgName" />
+          <el-table-column label="机构名称" align="left" header-align="center" width="250" prop="orgName" />
 
-          <el-table-column label="演练项目" align="left" header-align="center" prop="drillType">
+          <el-table-column label="演练项目" align="left" header-align="center" width="180" prop="drillType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.drillType"/>
             </template>
           </el-table-column>
-          <el-table-column  label="演练场景" scoped-slot="drillProjects" align="center" prop="drillProjects">
+          <el-table-column  label="演练场景" scoped-slot="drillProjects" align="center" width="180" prop="drillProjects">
             <template slot-scope="scope">
               <div class="ellipsis" :title="scope.row.drillProjects">{{ scope.row.drillProjects }}</div>
             </template>
@@ -81,7 +81,7 @@
               <div class="ellipsis" :title="scope.row.defaultCause">{{ scope.row.defaultCause }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" header-align="center" width="150" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
                 size="mini"

src/views/core/drill/plan/index.vue

@@ -8,8 +8,8 @@
       </el-col>
       <!--搜索栏-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="68px">
+        <div class="main-search-box">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
           <el-form-item label="任务名称" prop="planName">
             <el-input v-model="queryParams.planName" placeholder="请输入关键字" clearable
                       @keyup.enter.native="handleQuery"/>
@@ -61,8 +61,8 @@
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
-        <el-table height="555px" border :data="planList" @selection-change="handleSelectionChange"
+        </div>
+        <el-table height="640px" border :data="planList" @selection-change="handleSelectionChange"
                   row-key="id"
                   :tree-props="{ children: 'children' }">
           <el-table-column label="序号" align="center" width="60" prop="no"/>
@@ -89,10 +89,10 @@
           <!-- <el-table-column label="修改人" align="center" width="100" prop="updateBy"/> -->
           <el-table-column label="操作" align="left" header-align="center"  fixed="right" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-edit-outline"
+              <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-arrow-down"
                          @click="handlePublish(scope.row)" v-hasPermi="['core:drillPlan:publish']">下发
               </el-button>
-              <el-button v-if="checkCanRevocation(scope.row)" size="mini" type="text" icon="el-icon-down"
+              <el-button v-if="checkCanRevocation(scope.row)" size="mini" type="text" icon="el-icon-top-left"
                          @click="handleRevocation(scope.row)" v-hasPermi="['core:plan:edit']">撤回
               </el-button>
               <el-button v-if="checkCanEdit(scope.row)" size="mini" type="text" icon="el-icon-edit-outline"

src/views/core/drill/task/index.vue

@@ -6,8 +6,7 @@
                   @click="clickTreeNode" businessTree></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
           <el-form-item label="任务名称" prop="title">
             <el-input v-model="queryParams.title" placeholder="请输入关键字" clearable/>
           </el-form-item>

src/views/core/edu/plan/dialog.select.file.vue

@@ -1,6 +1,6 @@
 <template>
   <DialogCom
-    title="选择学习附件"
+    title="选取知识库文件"
     :visible.sync="isShow"
     class="g-dialog-select-safe-check"
     :close-on-click-modal="false"
@@ -22,11 +22,11 @@
       >
         <!-- 搜索 -->
         <template slot="searchs">
-          <el-form-item prop="title" label="资料标题">
-            <el-input v-model="search.title"></el-input>
+          <el-form-item prop="title" label="资料名称">
+            <el-input v-model="search.title" placeholder="请输入资料名称"/>
           </el-form-item>
           <el-form-item prop="fileName" label="文件名称">
-            <el-input v-model="search.fileName"></el-input>
+            <el-input v-model="search.fileName" placeholder="请输入文件名称"/>
           </el-form-item>
         </template>
 

src/views/core/edu/plan/index.vue

@@ -8,16 +8,15 @@
       </el-col>
       <!--搜索栏-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="100px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
           <el-form-item label="培训主题" prop="planName">
-            <el-input v-model="queryParams.planName" placeholder="请输入培训主题" clearable
+            <el-input v-model="queryParams.planName" placeholder="请输入关键字" clearable
                       maxlength="50"
                       @keyup.enter.native="handleQuery"/>
           </el-form-item>
           <el-form-item label="机构类型" prop="execOrgType">
-            <el-select v-model="queryParams.execOrgType" placeholder="请选择培训机构类型" clearable>
+            <el-select v-model="queryParams.execOrgType" placeholder="请选择机构类型" clearable>
               <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
                          :value="dict.value"/>
             </el-select>
@@ -41,17 +40,27 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item>
+          <!-- <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
                        v-hasPermi="['core:plan:add']">新增任务
             </el-button>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-
+          <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 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="['core:plan:add']">新增任务
+            </el-button>
+          </el-col>
           <!--   <el-col :span="1.5">
                <el-button type="success" plain icon="el-icon-edit-outline" size="mini" :disabled="single" @click="handleUpdate"
                           v-hasPermi="['core:plan:edit']">修改
@@ -82,11 +91,11 @@
           size="small" :data="planList" @selection-change="handleSelectionChange" row-key="id">
           <!-- :tree-props="{ children: 'children' }" -->
           <el-table-column label="序号" align="center" prop="no" width="60"/>
-          <el-table-column label="培训主题" align="left" header-align="center" width="200" prop="planName"/>
-          <el-table-column label="创建机构" align="left" header-align="center" width="180" prop="createOrgName"/>
-          <el-table-column label="行社名称" align="left" header-align="center" width="180" prop="belongOrgName"/>
+          <el-table-column label="培训主题" align="left" header-align="center" width="240" prop="planName"/>
+          <el-table-column label="创建机构" align="left" header-align="center" width="240" prop="createOrgName"/>
+          <el-table-column label="行社名称" align="left" header-align="center" width="240" prop="belongOrgName"/>
           <!-- <el-table-column label="所属机构" align="left" width="180" prop="belongOrgName"/> -->
-          <el-table-column label="机构类型" align="center" width="180" prop="execOrgType">
+          <el-table-column label="机构类型" align="center" width="120" prop="execOrgType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.execOrgType"/>
             </template>
@@ -105,25 +114,25 @@
                         </template>
                       </template>
                     </el-table-column>-->
-          <el-table-column label="任务周期" align="center" prop="planCycle">
+          <el-table-column label="任务周期" align="center" width="100" prop="planCycle">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.edu_plan_cycle" :value="scope.row.planCycle"/>
             </template>
           </el-table-column>
-          <el-table-column label="任务次数" align="center" prop="execTimes"/>
-          <el-table-column label="任务状态" align="center" prop="planStatus">
+          <el-table-column label="任务次数" align="center" width="100" prop="execTimes"/>
+          <el-table-column label="任务状态" align="center" width="100" prop="planStatus">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.edu_plan_status" :value="parseInt(scope.row.planStatus)"/>
             </template>
           </el-table-column>
 
-          <el-table-column label="备注" align="center" prop="remark"/>
-          <el-table-column label="操作" width="220" fixed="right" align="center" class-name="small-padding fixed-width">
+<!--          <el-table-column label="备注" align="center" prop="remark"/>-->
+          <el-table-column label="操作" width="180" align="left" header-align="center" fixed="right" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-down"
+              <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-arrow-down"
                          @click="handlePublish(scope.row)" v-hasPermi="['core:plan:edit']">下发
               </el-button>
-              <el-button v-if="checkCanRevocation(scope.row)" size="mini" type="text" icon="el-icon-down"
+              <el-button v-if="checkCanRevocation(scope.row)" size="mini" type="text" icon="el-icon-top-left"
                          @click="handleRevocation(scope.row)" v-hasPermi="['core:plan:edit']">撤回
               </el-button>
               <el-button v-if="checkCanEdit(scope.row)" size="mini" type="text" icon="el-icon-edit-outline"
@@ -214,7 +223,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="受训机构类型" prop="execOrgType">
-              <el-select style="width: 100%" v-model="form.execOrgType" placeholder="请选择受训机构类型"
+              <el-select style="width: 100%" v-model="form.execOrgType" placeholder="请选择机构类型"
                          @change="execOrgTypeChanged()">
                 <el-option v-for="dict in getUserOrgType" :key="dict.value" :label="dict.label"
                            :value="parseInt(dict.value)"></el-option>

src/views/core/edu/task/dialog.info.vue

@@ -64,7 +64,7 @@
                         </el-col>
                         <!-- 培训截止时间 -->
                         <el-col :span="12">
-                            <el-form-item prop="trainingEndDateTime" label="培训截止时间">{{
+                            <el-form-item prop="trainingEndDateTime" label="培训结束时间">{{
                                 formData.trainingEndDateTime
                             }}</el-form-item>
                         </el-col>
@@ -117,7 +117,7 @@
                         </el-col>
                         <!-- 图片 -->
                         <el-col :span="24">
-                            <el-form-item prop="imageList" label="参与人员签名">
+                            <el-form-item prop="imageList" label="参会人员签名">
                                 <ImageListPreview v-model="formData.signImageList"></ImageListPreview>
                                 <!-- <k-multi-upload :disabled="!!id" v-model="formData.imageList" limit="4" byModule
                                     moduleName="edu-training" v-if="isShow" /> -->
@@ -126,7 +126,7 @@
 
                         <!-- 文件 -->
                       <el-col :span="24">
-                        <el-form-item label="资料附件" prop="fileList">
+                        <el-form-item label="资料文件" prop="fileList">
                           <K-file-upload ref="upload" :isShowUploadBtn="false"
                                          :defaultValue="formFileListDefualtValue"
                                          v-model="formData.fileList"/>

src/views/core/edu/task/dialog.newTask.vue

@@ -65,14 +65,14 @@
                 <k-textarea v-model="formData.note" placeholder="请输入培训总结" :length="2000"/>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item prop="absenceList" label="参会人员">
                 <k-select :multiple="true" style="width: 100%" v-model="formData.absenceList" url="/user/find/all"
                           :params="{ orgId: formData.orgId }" placeholder="请选择参会人员"
                           @select="absenceUserSelectChanged"></k-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item prop="absentList" label="缺席人员">
                 <k-select :multiple="true"  style="width: 100%" v-model="formData.absentList" url="/user/find/all"
                           :params="{ orgId: formData.orgId }" @select="absentUserSelectChanged"

src/views/core/edu/task/index.vue

@@ -6,13 +6,12 @@
                   @click="clickTreeNode" businessTree></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="100px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
           <el-form-item label="培训主题" prop="title">
             <el-input
               v-model="queryParams.title"
-              placeholder="请输入培训主题"
+              placeholder="请输入关键字"
               clearable
               maxlength="50"
               @keyup.enter.native="handleQuery"
@@ -47,16 +46,25 @@
                     </el-select>
                 </el-form-item>-->
 
-          <el-form-item>
+          <!-- <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddTask">临时登记</el-button>
             <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
         <el-row :gutter="10" class="mb8">
           <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 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="handleAddTask">临时登记</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button>
           </el-col>
           <!--   <el-col :span="1.5">
                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
@@ -87,9 +95,9 @@
           height="600"
           size="small" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" align="center" width="70" prop="no"/>
-          <el-table-column label="培训主题" width="250" align="left" header-align="center" prop="title"/>
-          <el-table-column label="培训机构" width="250" align="left" header-align="center" prop="orgName"/>
-          <el-table-column label="培训进度" align="center" prop="status" width="150">
+          <el-table-column label="培训主题" width="315" align="left" header-align="center" prop="title"/>
+          <el-table-column label="受训机构" width="315" align="left" header-align="center" prop="orgName"/>
+          <el-table-column label="任务进度" align="center" prop="status" width="150">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.edu_training_do_status" :value="scope.row.status"/>
             </template>
@@ -134,7 +142,7 @@
                 <el-table-column label="主持人" width="140" align="center" prop="hostName" />-->
 
 
-          <el-table-column  style="width: auto" label="操作" fixed="right"
+          <el-table-column  label="操作" fixed="right" header-align="center"
                            class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
@@ -152,14 +160,14 @@
                 v-if="canPerform(scope.row)"
                 @click="handleRecorded(scope.row.id)"
                 v-hasPermi="['core:eduTask:remove']"
-              >培训登记
+              >任务登记
               </el-button>
               <el-button
                 icon="el-icon-document-copy"
                 type="text"
                 v-if="scope.row.pdfUrl"
                 @click="onDown(scope.row.pdfUrl)"
-              >登记簿
+              >培训登记簿
               </el-button>
             </template>
           </el-table-column>

src/views/core/materials/index.vue

@@ -9,13 +9,12 @@
       <!--用户数据-->
       <el-col :span="20" :xs="24">
 
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
           <el-form-item label="资料名称" prop="title">
             <el-input
               v-model="queryParams.title"
-              placeholder="请输入资料名称"
+              placeholder="请输入关键字"
               clearable
               maxlength="50"
               @keyup.enter.native="handleQuery"
@@ -37,13 +36,19 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item>
+          <!-- <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
         <el-row :gutter="10" class="mb8">
           <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 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"
@@ -62,9 +67,9 @@
           height="600"
           size="small"
           v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
-          <el-table-column label="序号" type="index" align="center" width="60"/>
-          <el-table-column label="创建机构" align="left" width="200" prop="orgName"/>
-          <el-table-column label="资料名称" align="left" width="160" prop="title"/>
+          <el-table-column label="序号" type="index" align="center" width="68"/>
+          <el-table-column label="创建机构" align="left" header-align="center" width="250" prop="orgName"/>
+          <el-table-column label="资料名称" align="left" header-align="center" width="250" prop="title"/>
 
           <el-table-column label="资料类型" align="center" width="180" prop="knowledgeId">
             <template slot-scope="scope">
@@ -75,17 +80,17 @@
           <!--          <el-table-column label="资料状态" align="center" prop="isOpen">
                       <template slot-scope="r">{{ r.row.isOpen == 0 ? '待发布' : '已发布' }}</template>
                     </el-table-column>-->
-          <el-table-column label="资料状态" align="center" header-align="center" prop="isOpen">
+          <el-table-column label="资料状态" width="100" align="center" header-align="center" prop="isOpen">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.materials_status" :value="scope.row.isOpen"/>
             </template>
           </el-table-column>
 
-          <el-table-column label="创建人" align="center" prop="createBy"/>
-          <el-table-column label="创建时间" align="center" prop="createTime"/>
-          <el-table-column width="250" scoped-slot="remark" align="center" prop="remark" label="备注"></el-table-column>
+          <el-table-column label="创建人" align="center" width="150" prop="createBy"/>
+          <el-table-column label="创建时间" align="center" width="180" prop="createTime"/>
+<!--          <el-table-column width="250" scoped-slot="remark" align="center" prop="remark" label="备注"></el-table-column>-->
 
-          <el-table-column label="操作" width="180" fixed="right" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作"  fixed="right" header-align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <!-- 公开 按钮显示逻辑: 仅当前用户上传的学习资料且处于未公开状态-->
               <el-button

src/views/core/reportForms/monitorAccessReport.vue

@@ -5,7 +5,7 @@
           v-show="showSearch"
           label-width="100px">
 
-            <el-form-item label="组织机构" class="formTreeItem">
+            <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
             <tree-select
               v-model="queryParams.orgId"
               :options="deptOptions"
@@ -34,11 +34,6 @@
           </el-form>
           <h3 class="title">{{ this.title}}</h3>
           <el-row :gutter="10" class="mb8">
-            <!-- <el-col :span="1.5">
-              <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
-                         v-hasPermi="['core:safetyInspectReport:export']">导出
-              </el-button>
-            </el-col> -->
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
           <el-table
@@ -150,6 +145,7 @@
         };
       },
       created() {
+        this.getDeptTree();
       this. getList();
       },
       watch: {

src/views/core/reportForms/safetyInspectReport.vue

@@ -1,16 +1,30 @@
 <template>
     <div class="app-container">
 
-          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"   label-width="100px">
 
-            <el-form-item label="统计机构" prop="orgId">
+            <!-- <el-form-item label="统计机构" prop="orgId">
 
 <el-select style="width: 100%;"  v-model="queryParams.orgId" placeholder="请选择统计机构">
   <el-option v-for="item in orgOptions" :key="item.id" :label="item.name"
     :value="item.id"></el-option>
 </el-select>
-</el-form-item>
+</el-form-item> -->
 
+<el-form-item label="组织机构"  prop="orgId" class="formTreeItem">
+            <tree-select
+              v-model="queryParams.orgId"
+              :options="deptOptions"
+              :show-count="true"
+              :normalizer="tenantIdnormalizer"
+              :props="{ checkStrictly: true, label: 'name' }"
+              placeholder="请选择归属机构"
+              clearValueText="清除"
+              :noChildrenText="''"
+              noOptionsText="没有数据"
+              noResultsText="没有搜索结果"
+            />
+          </el-form-item>
 
 <el-form-item label="年份" prop="year">
     <el-date-picker
@@ -112,8 +126,6 @@
           queryParams: {
             pageNum: 1,
             pageSize: 10,
-            checkName: null,
-            areaId: null,
             orgId: null,
             year:null
           },
@@ -146,7 +158,7 @@
         };
       },
       created() {
-      this.  getAllOrg();
+        this.getDeptTree();
       this. getList();
       },
       watch: {
@@ -157,7 +169,23 @@
       },
       methods: {
 
-   
+     /** 查询机构树数据 */
+  getDeptTree() {
+      deptTreeSelect().then((response) => {
+        this.deptOptions = response.data;
+      });
+    },
+           /** treeSelect组件自定义数据*/
+           tenantIdnormalizer(node, instanceId) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.shortName,
+        children: node.children,
+      };
+    },
         getPageIndex($index) {
           //表格序号
           return (
@@ -229,4 +257,10 @@
       }
     };
   </script>
-  
+    <style lang="scss" scoped>
+    ::v-deep.formTreeItem {
+      .el-form-item__content {
+        width: 264px;
+      }
+    }
+    </style>

src/views/resumption/plan/dialog.edit.vue

@@ -208,7 +208,7 @@
           height="400px"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection"></el-table-column>
+          <el-table-column type="selection" :selectable="handleSelectable"></el-table-column>
 
           <el-table-column label="是否扫描">
             <template v-slot="{ row }">
@@ -379,6 +379,10 @@ export default {
     ...mapGetters(["orgId", "orgName"]),
   },
   methods: {
+    handleSelectable(row) {
+      // 在这里根据特定条件判断是否禁用多选框行
+      return this.getshenglianshe(row); // 返回 true 禁用，返回 false 不禁用
+    },
     // 监听行选中事件，将选中的行数据存入 selectedRows 数组中
     handleSelectionChange(selection) {
       // console.log(selection, "selection");

src/views/system/dept/index.vue

@@ -39,10 +39,10 @@
                    @keyup.enter.native="handleQuery"
                  />
                </el-form-item>
-               <el-form-item label="状态" prop="isLock">
+               <el-form-item label="机构状态" prop="isLock">
                  <el-select
                    v-model="queryParams.isLock"
-                   placeholder="请选择状态"
+                   placeholder="请选择机构状态"
                    clearable
                  >
                    <el-option
@@ -112,7 +112,7 @@
                               prop="name"
                               label="机构名称"
              ></el-table-column>
-             <el-table-column
+             <el-table-column align="center"
                prop="shortName"
                label="机构简称"
              ></el-table-column>