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

src/api/system/role.js

@@ -8,7 +8,13 @@ export function listRole(query) {
     params: query
   })
 }
-
+export function allRole() {
+  return request({
+    url: '/system/role/allRole',
+    method: 'get',
+   // params: query
+  })
+}
 // 查询角色详细
 export function getRole(roleId) {
   return request({

src/views/core/accessPlan/index.vue

@@ -40,7 +40,7 @@
           </el-form-item>
 
           <el-form-item label="计划名称" prop="planName">
-            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable @keyup.enter.native="handleQuery" />
+            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" maxlength="50" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
 
           <el-form-item>
@@ -57,9 +57,9 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange" row-key="id"
+        <el-table v-loading="loading" :data="planList"  row-key="id"
           :tree-props="{ children: 'children' }">
-          <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" />
 
@@ -107,7 +107,7 @@
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="计划名称" prop="planName">
-          <el-input v-model="form.planName" placeholder="请输入计划名称" />
+          <el-input v-model="form.planName" placeholder="请输入计划名称" maxlength="50" />
         </el-form-item>
 
         <el-form-item label="调阅机构类型" prop="orgType">
@@ -172,7 +172,7 @@
 
 <script>
 import { listPlan, getPlan, delPlan, addPlan, updatePlan, distribute } from "@/api/core/accessPlan";
-import { listRole, findRoleByType, getRole } from "@/api/system/role";
+import { listRole, findRoleByType, getRole,allRole } from "@/api/system/role";
 import tableList from "@/mixins/tableList";
 import orgTree from "@/components/orgTree";
 import { deptTreeSelect } from "@/api/system/public";
@@ -228,15 +228,32 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        planName: [
+          { required: true, message: '请输入计划名称', trigger: 'change' },
+        ],
+        orgType: [
+          { required: true, message: '请选择机构类型', trigger: 'change' },
+        ],
+        planCycle: [
+          { required: true, message: '请选择调阅周期', trigger: 'change' },
+        ],
+        roleId: [
+          { required: true, message: '请选择调阅角色', trigger: 'change' },
+        ],
+        planFrequency: [
+          { required: true, message: '请选择调阅频次', trigger: 'change' },
+        ],
       }
     };
   },
   created() {
     this.getList();
-    listRole().then(response => {
-      this.roleList = response.rows;
+    // listRole().then(response => {
+    //   this.roleList = response.rows;
+    // });
+    allRole().then(response => {
+      this.roleList = response.data;
     });
-
   },
   methods: {
     /** 查询监控调阅计划列表 */

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

@@ -35,7 +35,7 @@
             >新增
             </el-button>
           </el-col>
-          <el-col :span="1.5">
+<!--          <el-col :span="1.5">
             <el-button
               type="warning"
               plain
@@ -45,7 +45,7 @@
               v-hasPermi="['core:drillDictionary:export']"
             >导出
             </el-button>
-          </el-col>
+          </el-col>-->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
@@ -56,12 +56,12 @@
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.drillType"/>
             </template>
           </el-table-column>
-          <el-table-column scoped-slot="drillProjects" align="center" prop="drillProjects">
+          <el-table-column  label="演练项目" scoped-slot="drillProjects" align="center" prop="drillProjects">
             <template slot-scope="scope">
               <div class="ellipsis" :title="scope.row.drillProjects">{{ scope.row.drillProjects }}</div>
             </template>
           </el-table-column>
-          <el-table-column scoped-slot="defaultCause" align="center" prop="defaultCause">
+          <el-table-column  label="预设案由" scoped-slot="defaultCause" align="center" prop="defaultCause">
             <template slot-scope="scope">
               <div class="ellipsis" :title="scope.row.defaultCause">{{ scope.row.defaultCause }}</div>
             </template>

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

@@ -52,27 +52,27 @@
                        v-hasPermi="['core:plan:add']">新增
             </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-                       v-hasPermi="['core:plan:edit']">修改
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                       v-hasPermi="['core:plan:remove']">删除
-            </el-button>
-          </el-col>
-          <!--        <el-col :span="1.5">
-                  <el-button
-                    type="warning"
-                    plain
-                    icon="el-icon-download"
-                    size="mini"
-                    @click="handleExport"
-                    v-hasPermi="['core:plan:export']"
-                  >导出
-                  </el-button>
-                </el-col>-->
+          <!--   <el-col :span="1.5">
+               <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+                          v-hasPermi="['core:plan:edit']">修改
+               </el-button>
+             </el-col>
+             <el-col :span="1.5">
+               <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+                          v-hasPermi="['core:plan:remove']">删除
+               </el-button>
+             </el-col>
+                     <el-col :span="1.5">
+                     <el-button
+                       type="warning"
+                       plain
+                       icon="el-icon-download"
+                       size="mini"
+                       @click="handleExport"
+                       v-hasPermi="['core:plan:export']"
+                     >导出
+                     </el-button>
+                   </el-col>-->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
@@ -404,7 +404,7 @@ export default {
     },
     //所属机构为当前用户登录机构时才显示 “编辑、删除”按钮
     checkCanEdit(row) {
-      return row.belongOrgId === this.$store.getters.orgId
+      return row.belongOrgId == this.$store.getters.orgId
     },
     checkCanDel(row) {
       //计划创建机构为当前机构且不是顶级机构创建的计划才显示“删除”按钮

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

@@ -90,7 +90,7 @@
             type="text"
             icon="el-icon-view"
             @click="handleDetail(scope.row.id)"
-            v-hasPermi="['system:eduTask:detail']"
+            v-hasPermi="['core:eduTask:detail']"
           >详情</el-button>
           <el-button
             size="mini"
@@ -98,21 +98,11 @@
             icon="el-icon-document-add"
             v-if="canPerform(scope.row)"
             @click="handleRecorded(scope.row.id)"
-            v-hasPermi="['system:eduTask:remove']"
+            v-hasPermi="['core:eduTask:remove']"
           >培训登记</el-button>
           <el-button type="text" v-if="scope.row.pdfUrl" @click="onDown(scope.row.pdfUrl)"
             >培训登记簿
           </el-button>
-          <!-- <el-button type="text" @click="onEdit(scope.row)">查看</el-button>
-          <el-button
-              type="text"
-              v-if="
-              r.row.auditFlag == 'PASS' &&
-                (isExecute || loginOrgId == r.row.orgId) && canPerform(r.row.eduJobIds)&&isOverOrUnStart(r.row)
-            "
-              @click="onPerform(r.row.id, r.row.eduJobIds, r.row.endDate)"
-          >执行
-          </el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -126,93 +116,6 @@
     />
   </el-col>
   </el-row>
-    <!-- 添加或修改教育任务对话框 -->
-    <!-- <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="教育培训计划Id" prop="planId">
-          <el-input v-model="form.planId" placeholder="请输入教育培训计划Id" />
-        </el-form-item>
-        <el-form-item label="培训岗位" prop="roleId">
-          <el-input v-model="form.roleId" placeholder="请输入培训岗位" />
-        </el-form-item>
-        <el-form-item label="开始日期" prop="startDate">
-          <el-date-picker clearable
-            v-model="form.startDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择开始日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="截止日期" prop="endDate">
-          <el-date-picker clearable
-            v-model="form.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择截止日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="实到人数" prop="actualCount">
-          <el-input v-model="form.actualCount" placeholder="请输入实到人数" />
-        </el-form-item>
-        <el-form-item label="内容">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="培训岗位名称" prop="roleName">
-          <el-input v-model="form.roleName" placeholder="请输入培训岗位名称" />
-        </el-form-item>
-        <el-form-item label="岗位id集合" prop="roleIds">
-          <el-input v-model="form.roleIds" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="岗位名集合" prop="roleNames">
-          <el-input v-model="form.roleNames" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="学习主题" prop="title">
-          <el-input v-model="form.title" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="总结" prop="note">
-          <el-input v-model="form.note" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="时间" prop="dateTime">
-          <el-date-picker clearable
-            v-model="form.dateTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="应到人数" prop="dueCount">
-          <el-input v-model="form.dueCount" placeholder="请输入应到人数" />
-        </el-form-item>
-        <el-form-item label="主持人" prop="hostId">
-          <el-input v-model="form.hostId" placeholder="请输入主持人" />
-        </el-form-item>
-        <el-form-item label="附件" prop="fileList">
-          <file-upload v-model="form.fileList"/>
-        </el-form-item>
-        <el-form-item label="图片" prop="imageList">
-          <image-upload v-model="form.imageList"/>
-        </el-form-item>
-        <el-form-item label="机构" prop="orgId">
-          <el-input v-model="form.orgId" placeholder="请输入机构" />
-        </el-form-item>
-        <el-form-item label="记录人" prop="recorderId">
-          <el-input v-model="form.recorderId" placeholder="请输入记录人" />
-        </el-form-item>
-        <el-form-item label="机构名称" prop="orgName">
-          <el-input v-model="form.orgName" placeholder="请输入机构名称" />
-        </el-form-item>
-        <el-form-item label="机构" prop="orgPath">
-          <el-input v-model="form.orgPath" placeholder="请输入机构" />
-        </el-form-item>
-        <el-form-item label="pdf下载地址" prop="pdfUrl">
-          <el-input v-model="form.pdfUrl" placeholder="请输入pdf下载地址" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </DialogCom> -->
 
     <dialog-info ref="infoDialog" @success="handleQuery(true)"></dialog-info>
     <dialog-perform ref="performDialog" @success="handleQuery(true)"></dialog-perform>

src/views/core/knowledge/index.vue

@@ -28,7 +28,7 @@
           v-hasPermi="['core:knowledge:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -48,7 +48,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['core:knowledge:remove']"
-        >删除</el-button>
+        >删除</el-button>-->
       </el-col>
       <el-col :span="1.5">
 <!--        <el-button

src/views/core/materials/index.vue

@@ -54,7 +54,7 @@
             >新增
             </el-button>
           </el-col>
-          <el-col :span="1.5">
+<!--          <el-col :span="1.5">
             <el-button
               type="success"
               plain
@@ -79,16 +79,16 @@
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <!--            <el-button
-                          type="warning"
-                          plain
-                          icon="el-icon-download"
-                          size="mini"
-                          @click="handleExport"
-                          v-hasPermi="['core:materials:export']"
-                        >导出
-                        </el-button>-->
-          </el-col>
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['core:materials:export']"
+            >导出
+            </el-button>
+          </el-col>-->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
         <!-- 表格数据 -->

src/views/information/configuration/index.vue

@@ -0,0 +1,237 @@
+<template>
+  <div class="container" style="min-height: 100%; padding-bottom: 100px;">
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-border">
+      <div style="display:inline-block;width:100%;">
+        <el-row>
+          <div style="background: grey">
+            每日履职
+          </div>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="营业前提醒分钟数" prop="workType">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="营业中提醒分钟数" prop="educationType">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="营业后提醒分钟数" prop="professionalQualifications">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="全天提醒分钟数" prop="professionalQualifications">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </div>
+      <div style="display:inline-block;width:100%;">
+        <el-row>
+          <div style="background: grey">
+            每周履职
+          </div>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="提前提醒天数" prop="educationType">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </div>
+      <div style="display:inline-block;width:100%;">
+        <el-row>
+          <div style="background: grey">
+            每月履职
+          </div>
+
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="提前提醒天数" prop="educationType">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+      <div style="display:inline-block;width:100%;">
+        <el-row>
+          <div style="background: grey">
+            每季履职
+          </div>
+
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="提前提醒天数" prop="educationType">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+      <div style="display:inline-block;width:100%;">
+        <el-row>
+          <div style="background: grey">
+            半年履职
+          </div>
+
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="提前提醒天数" prop="educationType">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+      <div style="display:inline-block;width:100%;">
+        <el-row>
+          <div style="background: grey">
+            每年履职
+          </div>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="提前提醒天数" prop="educationType">
+              <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+    </el-form>
+    <div style="margin-top: 50px; margin-left: 42%">
+      <el-button type="primary" @click="saveExtend" size="small">提交</el-button>
+      <el-button type="primary" @click="nosaveExtend" size="small">取消</el-button>
+    </div>
+  </div>
+  
+</template>
+
+<script>
+export default {
+  props: [],
+  components: {},
+  data() {
+    return {
+      num: 1,
+
+      formData:{
+        deptId: null,
+        duties: null,
+        workType: null,
+        isFullTime: "1",
+        highestEducation: null,
+        educationType: null,
+        certificateWork: "1",
+        professionalQualifications: null,
+        certificateFailReason: null,
+        workTime: null,
+        entryTime: null,
+        bornTime: null,
+        responsibilitiesLeaderName: null,
+        responsibilitiesLeaderDuties: null,
+        qualificationCertificateUrl: null,
+        userId: null,
+      },
+      rules: {
+        name: [
+          {
+            required: true,
+            message: "请输入活动名称",
+            trigger: "blur",
+          },
+          {
+            min: 3,
+            max: 5,
+            message: "长度在 3 到 5 个字符",
+            trigger: "blur",
+          },
+        ],
+        region: [
+          {
+            required: true,
+            message: "请选择活动区域",
+            trigger: "change",
+          },
+        ],
+        date1: [
+          {
+            type: "date",
+            required: true,
+            message: "请选择日期",
+            trigger: "change",
+          },
+        ],
+        date2: [
+          {
+            type: "date",
+            required: true,
+            message: "请选择时间",
+            trigger: "change",
+          },
+        ],
+        type: [
+          {
+            type: "array",
+            required: true,
+            message: "请至少选择一个活动性质",
+            trigger: "change",
+          },
+        ],
+        resource: [
+          {
+            required: true,
+            message: "请选择活动资源",
+            trigger: "change",
+          },
+        ],
+        desc: [
+          {
+            required: true,
+            message: "请填写活动形式",
+            trigger: "blur",
+          },
+        ],
+      },
+    }
+  },
+  watch: {},
+  computed: {},
+  beforeCreate() { },
+  created() { },
+  beforeMount() { },
+  mounted() { },
+  beforeUpdate() { },
+  updated() { },
+  destroyed() { },
+  methods: {
+    request() { },
+    handleChange(value) { },
+    hello() {
+      alert("来自预设逻辑代码的问候")
+    },
+    saveExtend(){
+     // this.formData.userId = this.$route.params.userId;
+     
+      this.$refs['form'].validate((valid) => {
+          if (valid) {
+            extendUserInformation(this.formData).then(res=>{
+                this.$message.success('保存成功！')
+                this.$router.go(-1)
+            })
+          }
+        });
+
+    },
+
+
+  },
+  fillter: {},
+}
+</script>
+
+<style scoped>
+.container {}
+
+.demo-border {
+  border: 1px grey dashed;
+  min-height: 1rem;
+  border-radius: 5px;
+}
+</style>