Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/views/core/task/index.vue

@@ -7,106 +7,82 @@
                     @click="clickTreeNode"></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-<!--
-      <el-form-item label="调阅周期" prop="cycle">
-        <el-select v-model="queryParams.cycle" placeholder="请选择周期" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_access_cycle"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>-->
-
-      <el-form-item label="任务名称" prop="taskName">
-        <el-input
-          v-model="queryParams.taskName"
-          placeholder="请输入任务名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-          maxlength="50"  />
-      </el-form-item>
-      <el-form-item label="调阅人员" prop="roleId">
-        <el-select v-model="queryParams.roleId" placeholder="请选择调阅人员" clearable>
-          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="任务进度" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择进度" clearable>
-          <el-option
-            v-for="dict in dict.type.retrieval_task_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="任务时间" prop="planStartTime">
-        <!-- <el-date-picker
-          v-model="queryParams.dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="['00:00:00', '23:59:59']"
-        ></el-date-picker> -->
-        <DataRangePicker
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              :default-time="['00:00:00', '23:59:59']"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              v-model="queryParams.dateRange"
-              :picker-options="pickerOptions"
-            >
-            </DataRangePicker>
-      </el-form-item>
-
+        <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="taskName">
+  <el-input
+    v-model="queryParams.taskName"
+    placeholder="请输入任务名称"
+    clearable
+    @keyup.enter.native="handleQuery"
+    maxlength="50"  />
+</el-form-item>
+<el-form-item label="调阅人员" prop="roleId">
+  <el-select v-model="queryParams.roleId" placeholder="请选择调阅人员" clearable>
+    <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+  </el-select>
+</el-form-item>
+<el-form-item label="任务进度" prop="status">
+  <el-select v-model="queryParams.status" placeholder="请选择进度" clearable>
+    <el-option
+      v-for="dict in dict.type.retrieval_task_status"
+      :key="dict.value"
+      :label="dict.label"
+      :value="dict.value"
+    />
+  </el-select>
+</el-form-item>
+<el-form-item label="任务时间" prop="planStartTime">
 
-      <!-- <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>
+  <DataRangePicker
+        type="daterange"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        :default-time="['00:00:00', '23:59:59']"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        v-model="queryParams.dateRange"
+        :picker-options="pickerOptions"
+      >
+      </DataRangePicker>
+</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 type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
-                         >重置
-                </el-button>
-              </el-col>
+<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 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-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['core:task:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+<el-col :span="1.5">
+  <el-button
+  type="primary" icon="el-icon-download"
+    size="mini"
+    @click="handleExport"
+    v-hasPermi="['core:task:export']"
+  >导出</el-button>
+</el-col>
+<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+</el-row>
+          </div>
 
-    <el-table v-loading="loading" :data="taskList"  border
+          <el-table v-loading="loading" :data="taskList"  border
               height="600"
               size="small">
 
-      <el-table-column label="序号" type="index" align="center">
+      <el-table-column label="序号" type="index" align="center" width="100">
         <template slot-scope="scope">
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="任务名称" align="center" prop="taskName" width="220"/>
+      <el-table-column label="任务名称" align="center" prop="taskName" width="220" show-overflow-tooltip="true"/>
       <el-table-column label="调阅机构" align="center" prop="orgName"  width="220"/>
       <el-table-column label="调阅人员" align="center" prop="roleName" width="160"/>
       <el-table-column label="任务进度" align="center" prop="status">
@@ -116,7 +92,7 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="任务时间" align="center" width="220">
+      <el-table-column label="任务时间" align="center" width="300">
         <template slot-scope="scope">
           {{scope.row.planStartTime}}~{{scope.row.planEndTime}}
         </template>
@@ -124,34 +100,6 @@
 
       <el-table-column label="异常数量" align="center" prop="exceptionCount" />
 
-<!--      <el-table-column label="调阅周期" align="center" prop="cycle" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_access_cycle" :value="scope.row.cycle" />
-        </template>
-      </el-table-column>-->
-<!--      <el-table-column label="开始时间" align="center" prop="planStartTime" width="160">-->
-<!--        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d}') }}</span>
-        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="截止时间" align="center" prop="planEndTime" width="160">
-&lt;!&ndash;        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>
-        </template>&ndash;&gt;
-      </el-table-column>-->
-
-
-
-<!--      <el-table-column label="调阅角色" align="center" prop="roleName" width="160"/>
-
-      <el-table-column label="调阅开始时间" align="center" prop="startTime" width="160">
-
-      </el-table-column>
-      <el-table-column label="调阅结束时间" align="center" prop="endTime" width="160">
-
-      </el-table-column>-->
-<!--      <el-table-column label="调阅人" align="center" prop="retrievalUserName" width="140"/>-->
-
       <el-table-column label="操作" fixed="right" style="width: 100px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -161,7 +109,7 @@
             @click="lookView(scope.row)"
             v-hasPermi="['core:task:query']"
           >详情</el-button>
-<!--          v-if="scope.row.status == 2"-->
+
         </template>
       </el-table-column>
     </el-table>
@@ -173,6 +121,9 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+        </div>
+   
+
       </el-col>
     </el-row>
   </div>

src/views/resumption/taskManager/index.vue

@@ -383,7 +383,7 @@ export default {
       this.queryParams.orgId = data.id;
       this.selectedOrgName = data.name;
       this.loadPlanList();
-      this.loadRoles();
+      this.loadRoles(data.id);
       this.getList();
     },
     resetQuery() {
@@ -409,9 +409,7 @@ export default {
     },
     loadRoles() {
       api
-        .getRoles({
-          orgId: this.queryParams.orgId,
-        })
+        .getRoles({ orgId: this.queryParams.orgId })
         .then((r) => (this.roleList = r.data));
     },
 

src/views/system/bind/index.vue

@@ -1,30 +1,19 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <!--部门数据-->
-      <!-- <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入机构名称" clearable size="small" prefix-icon="el-icon-search"
-            style="margin-bottom: 20px" />
-        </div>
-        <div class="tree-container">
-          <div style="margin-bottom: 10px;">
-            <el-checkbox v-model="queryParams.checkSub" @change="changeCheckBox">关联下级</el-checkbox>
-          </div>
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
-            :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="defaultKeys"
-            :default-checked-keys="defaultKeys" @node-click="handleNodeClick" />
-        </div>
-      </el-col> -->
+
 
       <!--机构数据-->
       <el-col :span="4" :xs="24">
-
         <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
           @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">
+        <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="areaName">
             <el-input v-model="queryParams.areaName" placeholder="请输入区域名称" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
@@ -41,13 +30,6 @@
                 :value=dict.value></el-option>
             </el-select>
           </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>
 
         <el-row :gutter="10" class="mb8">
@@ -67,8 +49,8 @@
 
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
-        <el-table border height="600" size="small" v-loading="loading" :data="bindList"
+          </div>
+          <el-table border height="600" size="small" v-loading="loading" :data="bindList"
           @selection-change="handleSelectionChange">
 
           <el-table-column label="序号" align="center" min-width="50">
@@ -89,8 +71,8 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="创建时间" align="center" prop="createTime" />
-          <el-table-column label="更新时间" align="center" prop="updateTime" />
+          <el-table-column label="创建时间" align="center" prop="createTime" width="200"/>
+          <el-table-column label="更新时间" align="center" prop="updateTime" width="200"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)"
@@ -102,6 +84,9 @@
         </el-table>
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
           @pagination="getList" />
+        </div>
+
+   
       </el-col>
     </el-row>