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

src/api/system/role.js

@@ -113,3 +113,20 @@ export function deptTreeSelect(id) {
     method: 'get'
   })
 }
+
+/**
+ * {
+ *  orgType:
+ * }
+ * @param {}} query 
+ * @returns 
+ */
+// 根据角色ID查询机构树结构
+export function findAllRole(query) {    
+  return request({
+    url: '/system/role/all',
+    method: 'get',
+    params:query
+  })
+}
+

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

@@ -76,7 +76,7 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :data="planList" @selection-change="handleSelectionChange" row-key="id"
+        <el-table max-height="550px" :data="planList" @selection-change="handleSelectionChange" row-key="id"
                   :tree-props="{ children: 'children' }">
           <el-table-column label="序号" align="center" prop="no"/>
           <el-table-column label="计划名称" align="center" prop="planName"/>
@@ -519,7 +519,8 @@ export default {
         if (valid) {
           let request={...this.form};
           if(this.form.planExecOrgIdList){
-          request.planExecOrgIdList = [this.form.planExecOrgIdList];
+            const list = Array.isArray(this.form.planExecOrgIdList) ? this.form.planExecOrgIdList : [this.form.planExecOrgIdList];
+          request.planExecOrgIdList = list;
         }
           else{
             request.planExecOrgIdList = [];

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

@@ -219,7 +219,7 @@ export default {
         content: null,
         title: null,
         eduJobId: null,
-        imageList: [],
+        imageList: "",
         absenceList: [],
         absentList: [],
         orgList: [],
@@ -240,7 +240,7 @@ export default {
         this.formData = response.data;
         this.loading = false;
         if (this.formData.imageList == null) {
-          this.formData.imageList = [];
+          this.formData.imageList = "";
         }
         if (this.formData.fileList == null) {
           this.formData.fileList = [];

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

@@ -91,6 +91,7 @@
                   label="履职机构类型"
                   v-model="formData.execOrgType"
                   placeholder="请选择履职机构类型"
+                  @change="onOrgTypeChanged"
                   clearable
                 >
                   <el-option
@@ -106,7 +107,7 @@
             <el-col :span="6">
               <el-form-item prop="roleList" label="履职角色:">
                 <el-select
-                  @visible-change="getRolesByOrg"
+                  
                   label="履职角色"
                   v-model="formData.roleList"
                   placeholder="请选择履职角色"
@@ -116,8 +117,8 @@
                 >
                   <el-option
                     v-for="item in resumptionRoles"
-                    :key="item.index"
-                    :label="item.roleName"
+                    :key="item.id"
+                    :label="item.name"
                     :value="item.id"
                   >
                   </el-option>
@@ -215,7 +216,7 @@
 import { mapGetters } from "vuex";
 import * as api from "@/api/resumption/plan";
 import { statusOptions } from "./../../commonOption";
-import { listRole } from "@/api/system/role";
+import { findAllRole } from "@/api/system/role";
 import DialogSelect from "@/views/resumption/ruleManager/dialog.select.point.vue";
 export default {
   dicts: [
@@ -335,9 +336,9 @@ export default {
       let params = {
         orgType: this.formData.execOrgType,
       };
-      listRole(params).then((res) => {
+      findAllRole(params).then((res) => {
         // console.info(res);
-        this.resumptionRoles = res.rows;
+        this.resumptionRoles = res.data;
       });
     },
     handleChange(value) {
@@ -345,8 +346,10 @@ export default {
       this.count = value;
     },
     async refresh(id, other) {
-      this.getRolesByOrg();
       this.formData = id ? (await api.get(id)).data : this.reset(other);
+      if(this.formData.execOrgType){
+        this.getRolesByOrg();
+      } 
     },
     onSelect(selectList){
       console.log(selectList);
@@ -370,6 +373,9 @@ export default {
       
       
     },
+    onOrgTypeChanged(){
+      this.getRolesByOrg();
+    },
     async show(id, other = {}) {
       this.id = id;
       this.tableData = null;

src/views/resumption/plan/distribute.vue

@@ -62,7 +62,7 @@ export default {
       this.info.id = plan.id;
       listByTypes({
         orgId: plan.planCreateOrgId,
-        orgTypes: ["2", "3", "4"],
+        orgTypes: ["3"],
       }).then((r) => {
         this.info.orgAndStatus = r.data.map((d) => {
           return { orgId: d.id, orgName: d.name, status: "1" };

src/views/resumption/plan/index.vue

@@ -393,7 +393,7 @@ export default {
     ...mapMutations([]),
         //已完成下发的计划不显示下发按钮
     checkCanPublish(row) {
-      if (row.orgType === 1) {
+      if (row.createOrgType == "1") {
         return true
       }
       return false;

src/views/resumption/ruleManager/dialog.editItem.vue

@@ -3,13 +3,12 @@
     <el-dialog
       :title="!formData.id ? '新增履职项' : '编辑履职项'"
       :visible.sync="dialogVisible"
-      width="60%"
+      width="50%"
       :show-close="true"
       @close="onHide"
     >
       <div>
         <div class="box">
-          <p>履职项</p>
           <el-form
             ref="form"
             :model="formData"
@@ -30,7 +29,7 @@
         <div class="box">
           <p>履职内容</p>
           <div style="margin-bottom: 10px">
-            <el-button type="primary" @click="onEdit(-1)">新增</el-button>
+            <el-button type="primary" @click="onEdit(-1)">新增履职内容</el-button>
           </div>
           <el-table :data="formData.pointDtoList" border style="width: 100%">
             <el-table-column prop="name" label="履职内容"> </el-table-column>

src/views/system/check/index.vue

@@ -4,18 +4,15 @@
       <el-form-item label="采集点名称" prop="checkName">
         <el-input v-model="queryParams.checkName" placeholder="请输入采集点名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-
       <el-form-item label="区域" prop="areaId">
         <el-select v-model="queryParams.areaId" placeholder="请选择">
           <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
-
       <el-form-item label="归属部门" prop="orgId">
         <treeselect style="width: 160px;" v-model="queryParams.orgId" :options="deptOptions" :show-count="true"
           :normalizer="tenantIdnormalizer" :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属部门" />
       </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>
@@ -65,12 +62,8 @@
     <!-- 添加或修改区域采集点对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="采集点名称" prop="checkName">
-          <el-input v-model="form.checkName" placeholder="请输入采集点名称" />
-        </el-form-item>
-
         <el-row>
-          <el-col :span="12">
+          <el-col :span="16">
             <el-form-item label="区域名称">
               <el-select v-model="form.areaId" placeholder="请选择区域名称">
                 <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
@@ -78,18 +71,17 @@
             </el-form-item>
           </el-col>
         </el-row>
-
-
+        <el-form-item label="采集点名称" prop="checkName">
+          <el-input v-model="form.checkName" placeholder="请输入采集点名称" />
+        </el-form-item>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="16">
             <el-form-item label="归属部门" prop="orgId">
               <treeselect v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
                 :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属部门" />
             </el-form-item>
           </el-col>
         </el-row>
-
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>