Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_web into dev

src/api/core/edu/plan.js

@@ -53,11 +53,14 @@ export function listPlanRole(query) {
 }
 
 //获取教育培训计划角色列表
-export function roleList() {
+export function roleList(query) {
+  console.log("queryquery",query)
   return request({
     url: '/system/role/all',
     method: 'get',
-    params: null
+    params: {
+      orgType: query
+    }
   })
 }
 

src/api/core/task.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询列表监控调阅任务
 export function listTask(query) {
   return request({
-    url: '/core/task/list',
+    url: '/core/retrievalTask/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listTask(query) {
 // 查询详细监控调阅任务
 export function getTask(id) {
   return request({
-    url: '/core/task/' + id,
+    url: '/core/retrievalTask/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getTask(id) {
 // 新增监控调阅任务
 export function addTask(data) {
   return request({
-    url: '/core/task',
+    url: '/core/retrievalTask',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addTask(data) {
 // 修改监控调阅任务
 export function updateTask(data) {
   return request({
-    url: '/core/task',
+    url: '/core/retrievalTask',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateTask(data) {
 // 删除监控调阅任务
 export function delTask(id) {
   return request({
-    url: '/core/task/' + id,
+    url: '/core/retrievalTask/' + id,
     method: 'delete'
   })
 

src/api/resumption/plan.js

@@ -16,6 +16,14 @@ export function itemfind(id) {
     method: 'get'
   })
 }
+// 查询【请填写功能名称】详细
+export function distribute(query) {
+  return request({
+    url: '/core/api/plan/distribute' ,
+    method: 'post',
+    data: query
+  })
+}
 export function getPointIds(id) {
   return request({
     url: '/core/api/plan/getPointIds/' + id,

src/views/core/accessPlan/index.vue

@@ -28,7 +28,7 @@
             :value="`${dict.value}`"></el-option>
         </el-select>
       </el-form-item>
-    
+
       <el-form-item label="计划名称" prop="planName">
         <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -63,21 +63,21 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="计划所属机构" align="center" prop="orgName" />
       <el-table-column label="计划名称" align="center" prop="planName" />
-  
+
       <el-table-column label="机构类型" align="center" key="orgType" prop="orgType"  width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.orgType" />
             </template>
           </el-table-column>
       <el-table-column label="调阅角色" align="center" prop="roleName" />
-   
+
       <el-table-column label="调阅周期" align="center" key="planCycle" prop="planCycle"  width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_access_cycle" :value="scope.row.planCycle" />
             </template>
           </el-table-column>
       <el-table-column label="调阅频次" align="center" prop="planFrequency" />
-    
+
       <el-table-column label="计划状态" align="center" key="planStatus" prop="planStatus"  width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.planStatus" />
@@ -105,7 +105,7 @@
         <el-form-item label="计划名称" prop="planName">
           <el-input v-model="form.planName" placeholder="请输入计划名称" />
         </el-form-item>
-       
+
         <el-form-item label="调阅机构类型" prop="orgType">
         <el-select style="width: 100%;" v-model="form.orgType" placeholder="请选择">
           <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
@@ -121,8 +121,8 @@
 
 
 
-    
-            <el-form-item style="width: 100%;" v-if="form.planCycle==1" label="开始时间" prop="startTime">
+
+            <el-form-item style="width: 100%;" v-if="form.planCycle==0" label="开始时间" prop="startTime">
               <el-date-picker
                 clearable
                 v-model="form.startTime"
@@ -131,11 +131,11 @@
                 placeholder="请选择时间">
               </el-date-picker>
             </el-form-item>
- 
 
 
-        
-            <el-form-item style="width: 100%;" v-if="form.planCycle==1" label="结束时间" prop="endTime">
+
+
+            <el-form-item style="width: 100%;" v-if="form.planCycle==0" label="结束时间" prop="endTime">
               <el-date-picker
                 clearable
                 v-model="form.endTime"
@@ -144,7 +144,7 @@
                 placeholder="请选择时间">
               </el-date-picker>
             </el-form-item>
-      
+
 
 
       <el-form-item label="调阅角色" prop="roleId">
@@ -154,7 +154,7 @@
       </el-form-item>
         <el-form-item label="调阅频次" prop="planFrequency">
           <el-input type="number" v-model.number="form.planFrequency"  placeholder="请输入调阅频次" />
-        </el-form-item> 
+        </el-form-item>
         <el-form-item label="备注" prop="description">
           <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
         </el-form-item>

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

@@ -22,7 +22,7 @@
         <el-form-item label="计划周期" prop="planCycle">
           <el-select v-model="queryParams.planCycle" placeholder="请选择计划周期" clearable>
             <el-option
-              v-for="dict in dict.type.plan_cycle"
+              v-for="dict in dict.type.edu_plan_cycle"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -123,7 +123,7 @@
         </el-table-column>
         <el-table-column label="计划周期" align="center" prop="planCycle">
           <template slot-scope="scope">
-            <dict-tag :options="dict.type.plan_cycle" :value="scope.row.planCycle"/>
+            <dict-tag :options="dict.type.edu_plan_cycle" :value="scope.row.planCycle"/>
           </template>
         </el-table-column>
         <el-table-column prop="planRoleNameList" label="培训角色">
@@ -201,7 +201,7 @@
             <el-form-item label="计划周期" prop="planCycle">
               <el-select v-model="form.planCycle" placeholder="请选择计划周期">
                 <el-option
-                  v-for="dict in dict.type.plan_cycle"
+                  v-for="dict in dict.type.edu_plan_cycle"
                   :key="dict.value"
                   :label="dict.label"
                   :value="parseInt(dict.value)"
@@ -259,7 +259,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="培训机构类型" prop="execOrgType">
-              <el-select v-model="form.execOrgType" placeholder="请选择执行机构类型">
+              <el-select v-model="form.execOrgType" placeholder="请选择执行机构类型" @change="execOrgTypeChanged()">
                 <el-option
                   v-for="dict in dict.type.sys_org_type"
                   :key="dict.value"
@@ -320,7 +320,7 @@ import {formatTime} from "@/utils/ruoyi";
 
 export default {
   name: "Plan",
-  dicts: ['plan_cycle', 'sys_org_type', 'plan_status'],
+  dicts: ['plan_cycle', 'sys_org_type', 'plan_status','edu_plan_cycle'],
   components: {OrgTree},
   data() {
     return {
@@ -395,8 +395,8 @@ export default {
       });
     },
     //初始化所有角色数据
-    initRoleList() {
-      roleList({}).then(response => {
+    initRoleList(query) {
+      roleList(query).then(response => {
         this.roleList = response.data;
       });
     },
@@ -433,6 +433,10 @@ export default {
     checkCreateByTopOrg(row) {
       return row.createByTopOrg !== 1
     },
+    execOrgTypeChanged(row){
+      console.log("this.form.execOrgType",this.form.execOrgType);
+      this.initRoleList(this.form.execOrgType);
+    },
     /** 查询机构树数据 */
     getDeptTree() {
       deptTreeSelect().then(response => {

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

@@ -0,0 +1,157 @@
+<template>
+    <div class="edu-training-edit">
+        <el-dialog title="调阅详情" :visible.sync="isShow" width="960px">
+            <div class="page-body">
+                <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
+                    label-suffix=":">
+                    <el-row>
+
+                         <el-col :span="12">
+                            <el-form-item prop="type" label="任务名称">{{
+                                formData.taskName
+                            }}</el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="任务状态">
+                                <template>
+                                    <dict-tag :options="dict.type.retrieval_task_status" :value="formData.status"/>
+                                </template>
+                            </el-form-item>
+                        </el-col>
+
+                           <el-col :span="12">
+                            <el-form-item prop="trainingStartDateTime" label="任务时间">{{
+                                formData.planStartTime
+                            }}-{{ formData.planEndTime}}</el-form-item>
+                        </el-col>
+
+                      <el-col :span="12">
+                        <el-form-item prop="dueCount" label="调阅机构">{{
+                            formData.orgName
+                          }}</el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item prop="dueCount" label="调阅角色">{{
+                            formData.roleName
+                          }}</el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item prop="dueCount" label="调阅人">{{
+                            formData.retrievalUserName
+                          }}</el-form-item>
+                      </el-col>
+                          <!-- 培训截止时间 -->
+                          <el-col :span="12">
+                            <el-form-item prop="trainingEndDateTime" label="调阅开始时间">{{
+                                formData.startTime
+                            }}</el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item prop="trainingEndDateTime" label="调阅结束时间">{{
+                              formData.endTime
+                            }}</el-form-item>
+                        </el-col>
+
+
+                    </el-row>
+                  <el-table v-loading="loading" :data="formData.taskDataVoList" @selection-change="handleSelectionChange">
+                    <el-table-column label="序号" type="index" align="center">
+                      <template slot-scope="scope">
+                        <span>{{scope.$index + 1}}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="视频主机" align="center" prop="hostName" />
+                    <el-table-column label="视频通道" align="center" prop="channelName" />
+                    <el-table-column label="项目" align="center" prop="project" >
+                      <template slot-scope="scope">
+                        <dict-tag :options="dict.type.core_registration_project" :value="scope.row.project"/>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="检查情况" align="center" prop="situation" >
+                      <template slot-scope="scope">
+                      <dict-tag :options="dict.type.core_check_type" :value="scope.row.situation"/>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="说明" align="center" prop="remark" />
+                  </el-table>
+                </el-form>
+            </div>
+
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="onHide">关闭</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { mapState, mapMutations } from "vuex";
+import { getEduTask } from "@/api/core/edu/eduTask";
+import { getTask} from "@/api/core/task";
+export default {
+    components: {},
+  dicts: ['core_registration_project', 'core_check_type'],
+    data() {
+        const params = this.$route.params;
+        return {
+            id: params ? params.id : null,
+            isShow: false,
+            formData: this.reset(),
+        };
+    },
+    props: {},
+    watch: {},
+    computed: {
+        ...mapState(["loginUser"]),
+    },
+    methods: {
+        ...mapMutations([]),
+        reset(other = {}) {
+            return {
+              id: null,
+              taskName: null,
+              status: {},
+              planStartTime: {},
+              planEndTime: null,
+              orgName: null,
+              roleName: null,
+              retrievalUserName: null,
+              startTime: null,
+              endTime:null,
+              taskDataVoList:[],
+                ...other,
+            };
+        },
+        async refresh(id, other) {
+            if (!id) {
+                this.reset(other);
+            }
+            else {
+              getTask(id).then(response => {
+                this.formData = response.data;
+                this.open = true;
+                this.title = "调阅详情";
+              });
+            }
+        },
+        async show(id, other = {}) {
+            this.id = id;
+            await this.refresh(id, other);
+            this.isShow = true;
+        },
+        // 事件
+        onHide() {
+            this.isShow = false;
+        },
+        // 事件
+        //apimark//
+    },
+    mounted() { },
+};
+</script>
+
+<!-- <style lang="less">
+.edu-training-edit {
+}
+</style> -->

src/views/core/task/index.vue

@@ -81,19 +81,19 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" align="center">
         <template slot-scope="scope">
-          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
+          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
       <el-table-column label="任务名称" align="center" prop="taskName" />
       <el-table-column label="开始时间" align="center" prop="planStartTime" width="180">
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d}') }}</span>
-        </template>
+        </template>-->
       </el-table-column>
       <el-table-column label="结束时间" align="center" prop="planEndTime" width="180">
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>
-        </template>
+        </template>-->
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -104,14 +104,14 @@
       <el-table-column label="调阅角色" align="center" prop="roleName" />
 
       <el-table-column label="调阅开始时间" align="center" prop="startTime" width="180">
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
-        </template>
+        </template>-->
       </el-table-column>
       <el-table-column label="调阅结束时间" align="center" prop="endTime" width="180">
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
-        </template>
+        </template>-->
       </el-table-column>
       <el-table-column label="调阅人" align="center" prop="retrievalUserName" />
       <el-table-column label="异常数" align="center" prop="exceptionCount" />
@@ -121,13 +121,14 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-if="scope.row.status === '2'"
+            @click="lookView(scope.row)"
+            v-if="scope.row.status == 2"
+            v-hasPermi="['core:task:query']"
           >查看</el-button>
         </template>
       </el-table-column>
     </el-table>
-
+        <dialog-info ref="infoDialog" @success="refresh(true)"></dialog-info>
     <pagination
       v-show="total>0"
       :total="total"
@@ -143,9 +144,10 @@
 <script>
 import { listTask, getTask, delTask, addTask, updateTask,roleList } from "@/api/core/task";
 import OrgTree from "@/components/orgTree";
+import DialogInfo from "./dialog.info";
 import {listPlanRole} from "@/api/core/edu/plan";
 export default {
-  components: {OrgTree},
+  components: {OrgTree,DialogInfo},
   name: "Task",
   dicts: ['plan_cycle', 'retrieval_task_status'],
   data() {
@@ -261,6 +263,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      this.queryParams.dateRange = [];
       this.getList();
     },
     /** 重置按钮操作 */
@@ -281,48 +284,14 @@ export default {
       this.title = "添加监控调阅任务";
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getTask(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改监控调阅任务";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateTask(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addTask(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除监控调阅任务编号为"' + ids + '"的数据项？').then(function() {
-        return delTask(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+    lookView(row) {
+      this.$refs["infoDialog"].show(row.id,{});
+
     },
+
     /** 导出按钮操作 */
     handleExport() {
-      this.download('core/task/export', {
+      this.download('core/retrievalTask/export', {
         ...this.queryParams
       }, `task_${new Date().getTime()}.xlsx`)
     }

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

@@ -286,10 +286,14 @@ export default {
       isShow: false,
       formData: this.reset(),
       formDataRules: {
-        name: [{ required: true, message: "请输入履职内容库名称" }],
-        type: [{ required: true, message: "请选择履职类型" }],
-        orgType: [{ required: true, message: "请选择履职机构类型" }],
-        status: [{ required: true, message: "请选择状态" }],
+        planName: [{ required: true, message: "请输入计划名称" }],
+        planType: [{ required: true, message: "请选择计划类型" }],
+        planCycle: [{ required: true, message: "请选择履职周期" }],
+        planStatus: [{ required: true, message: "请选择计划状态" }],
+        execOrgType: [{ required: true, message: "请选择履职角色" }],
+        roleList: [{ required: true, message: "请选择履职角色" }],
+        planExec: [{ required: true, message: "请选择履职时间" }],
+        count: [{ required: true, message: "请选择履职次数" }],
       },
       statusOptions: statusOptions,
     };
@@ -341,6 +345,7 @@ export default {
       this.count = value;
     },
     async refresh(id, other) {
+      this.getRolesByOrg();
       this.formData = id ? (await api.get(id)).data : this.reset(other);
     },
     onSelect(selectList){
@@ -409,7 +414,7 @@ export default {
         this.formData.planCreateOrgName = this.orgName;
         if (!isValidate) return;
         this.formData.itemList = this.tableData == null ? [] : this.tableData;
-        this.formData.roleList = this.selectedValues;
+        this.formData.roleList = this.selectedValues.length==0?null:this.selectedValues;
         await api.update(this.formData);
         this.$emit("success");
         this.onHide();

src/views/resumption/plan/index.vue

@@ -309,7 +309,7 @@
       :orgTypeOptions="dict.type.sys_org_type"
       :ruleTypeOptions="dict.type.rule_type"
     ></dialog-edit>
-    <DialogDistribute ref="dialogDistribute"></DialogDistribute>
+    <DialogDistribute ref="dialogDistribute" @select="sel"></DialogDistribute>
   </div>
 </template>
 
@@ -386,7 +386,13 @@ export default {
   },
   methods: {
     ...mapMutations([]),
-
+    sel(selectList){
+      this.loading = true;
+      api.distribute(selectList).then((response) => {
+        this.getList();
+          this.loading = false;
+        })
+    },
     getRolesByOrg() {
       let params = {
         // orgId:this.queryParams.orgId

src/views/system/dept/index.vue

@@ -361,7 +361,8 @@ export default {
         leader: undefined,
         phone: undefined,
         email: undefined,
-        status: "0"
+        status: "0",
+        isLock: "0"
       };
       this.resetForm("form");
     },

src/views/system/user/index.vue

@@ -328,6 +328,9 @@ export default {
           { required: true, message: "用户密码不能为空", trigger: "blur" },
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
         ],
+        orgId: [
+        { required: true, message: "所属机构不能为空", trigger: "blur" }
+        ],
         // email: [
         //   {
         //     type: "email",