Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/api/systemManage.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import request2 from '@/utils/request2'
 import qs from 'qs'
 let api = '/api-web'
 
@@ -394,3 +395,11 @@ export function queryEmployeeOrganByUser(data) {
     params: data
   })
 }
+
+// request2
+export const getPosition = data => request2({
+  url:api +  '/position/findAll',
+  params:data,
+  method: 'get',
+  requestType: 'form'
+})

src/layout/components/AppMain.vue

@@ -93,12 +93,12 @@
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane label="操作流程" name="first">
           <div class="optionWrap">
-            <div v-html="activeRow.opFlow"></div>
+            <div  class="ql-editor" v-html="activeRow.opFlow"></div>
           </div>
         </el-tab-pane>
         <el-tab-pane label="功能规则" name="second">
           <div class="optionWrap">
-            <div v-html="activeRow.funRule"></div>
+            <div class="ql-editor" v-html="activeRow.funRule"></div>
           </div>
         </el-tab-pane>
       </el-tabs>
@@ -114,6 +114,9 @@ import {
   getSysManualList,
   getSysManualMenuIds,
 } from "@/views/operationManual/api";
+import "quill/dist/quill.core.css";
+import "quill/dist/quill.snow.css";
+import "quill/dist/quill.bubble.css";
 export default {
   name: "AppMain",
   data() {
@@ -233,12 +236,12 @@ export default {
   .optionWrap {
     box-sizing: border-box;
     width: 100%;
-    padding: 10px;
+    padding: 10px 8px;
     /deep/img {
       width: 100%;
     }
     /deep/ p {
-      margin-bottom: 10px;
+      line-height: 28px;
     }
     /deep/.ql-video {
       width: 100%;

src/views/categroyManager/insideSetting/staffManager.vue

@@ -65,8 +65,8 @@
               :value="item.value"
             ></el-option>
           </el-select>
-          <!-- collapse-tags -->
         </el-form-item>
+
         <el-form-item>
           <el-button native-type="submit" type="danger">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
@@ -107,6 +107,11 @@
               ></tooltip>
             </template>
           </el-table-column>
+          <el-table-column align="center" label="职位">
+            <template slot-scope="scope">
+              <tooltip :content="scope.row.positionNames"></tooltip>
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="jobNature" label="工作类型">
             <template slot-scope="scope">
               {{ scope.row.jobNature | jobNature }}
@@ -382,6 +387,31 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item
+              label="员工职位"
+              prop="positionIds"
+              :label-width="formLabelWidth"
+            >
+              <select-all
+                v-model.trim="form.positionIds"
+                placeholder="请选择员工职位"
+                clearable
+                filterable
+                collapse-tags
+                multiple
+              >
+                <el-option
+                  v-for="item in positionList"
+                  :key="item.id"
+                  :label="item.roleName"
+                  :value="item.id"
+                ></el-option>
+              </select-all>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <!-- <el-alert
           style="margin: 10px 0"
           title="OA信息"
@@ -546,6 +576,7 @@ import {
   hasCourseGroupRelation,
   updateEducationTeacherId,
   queryEmployeeOrganByUser,
+  getPosition,
   getDepts,
   getPosts,
 } from "@/api/systemManage";
@@ -653,6 +684,14 @@ export default {
             trigger: "change",
           },
         ],
+             positionIds: [
+          {
+            type: "array",
+            required: true,
+            message: "请选择员工职位",
+            trigger: "change",
+          },
+        ],
         // deptIds: [{ type: 'array', required: true, message: '请选择所属部门', trigger: 'change' }],
         // postIds: [{ type: 'array', required: true, message: '请选择所属岗位', trigger: 'change' }],
         jobNature: [
@@ -668,6 +707,7 @@ export default {
         organId: null,
         roleId: null,
       },
+      positionList:[]
     };
   },
   mounted() {
@@ -888,6 +928,14 @@ export default {
           this.organList = res.data;
         }
       });
+
+      // 获取员工职位
+      try{
+        const res = await getPosition()
+        this.positionList = res.data;
+      }catch(e){
+        console.log(e)
+      }
       this.formActionTitle = type;
       this.roleStatus = true;
 

src/views/categroyManager/specialSetup/branchSetting.vue

@@ -9,7 +9,7 @@
         @click="onBranchOperation('create')"
         v-permission="'organization/add'"
         type="primary"
-        style="margin-bottom:20px"
+        style="margin-bottom: 20px"
       >
         新建
       </el-button>
@@ -45,6 +45,12 @@
                 type="text"
                 >修改</el-button
               >
+              <el-button
+                @click="showCode(scope.row)"
+                v-permission="'organization/update'"
+                type="text"
+                >注册二维码</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -162,7 +168,7 @@
             placeholder="选择成立时间"
           ></el-date-picker>
         </el-form-item>
-        <el-alert
+        <!-- <el-alert
           style="margin: 20px 0"
           title="分部人员配置"
           :closable="false"
@@ -238,7 +244,7 @@
               }}</span>
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="branchStatus = false">取 消</el-button>
@@ -247,10 +253,12 @@
         >
       </span>
     </el-dialog>
+    <qr-code v-model="codeStatus" :title="codeTitle" :codeUrl="qrCodeUrl" />
   </div>
 </template>
 <script>
 import pagination from "@/components/Pagination/index";
+import qrCode from "@/components/QrCode/index";
 import {
   branchQueryPage,
   areaQueryChild,
@@ -258,10 +266,11 @@ import {
   branchUpdate,
   getParentArea,
 } from "@/api/specialSetting";
+import { vaildStudentUrl } from "@/utils/validate";
 import { queryEmployByOrganId } from "@/api/systemManage";
 export default {
   name: "branchSetting",
-  components: { pagination },
+  components: { pagination, qrCode },
   data() {
     return {
       tableList: [],
@@ -293,7 +302,7 @@ export default {
         organManager: [],
         educationId: [],
         repairId: [],
-        joinTeacherId:[]
+        joinTeacherId: [],
       },
       rules: {
         name: [{ required: true, message: "请输入分部名称", trigger: "blur" }],
@@ -309,6 +318,9 @@ export default {
           { required: true, message: "请选择学年制", trigger: "change" },
         ],
       },
+      codeStatus: false,
+      qrCodeUrl: null,
+      codeTitle: "注册二维码",
     };
   },
   mounted() {
@@ -322,11 +334,11 @@ export default {
         this.form.areaId = this.form.city;
         let obj = {
           ...this.form,
-          organManager:this.form.organManager.join(','),
-          educationId:this.form.educationId.join(','),
-          repairId:this.form.repairId.join(','),
-          joinTeacherId:this.form.joinTeacherId.join(',')
-        }
+          organManager: this.form.organManager.join(","),
+          educationId: this.form.educationId.join(","),
+          repairId: this.form.repairId.join(","),
+          joinTeacherId: this.form.joinTeacherId.join(","),
+        };
 
         if (this.formActionTitle == "create") {
           if (this.form.id) {
@@ -399,8 +411,12 @@ export default {
       // 修改分部信息
       // employeeFindEmployeeByRole
       try {
-        const res = await queryEmployByOrganId({ organId: row.id, rows: 9999, demissionflag:false,lockFlag:false});
-        console.log(res)
+        const res = await queryEmployByOrganId({
+          organId: row.id,
+          rows: 9999,
+          demissionflag: false,
+          lockFlag: false,
+        });
         this.$set(this, "employeeList", res.data.rows);
       } catch (e) {
         console.log(e);
@@ -419,19 +435,29 @@ export default {
                 address: row.address,
                 registerDate: row.registerDate,
                 gradeType: row.gradeType == 1 ? "FIVE_PLUS" : "SIX_PLUS",
-                organManager:row.organManager?row.organManager.split(','):[],
-                repairId:row.repairId?row.repairId.split(','):[],
-                joinTeacherId:row.joinTeacherId?row.joinTeacherId.split(','):[],
-                educationId:row.educationId?row.educationId.split(','):[],
+                organManager: row.organManager
+                  ? row.organManager.split(",")
+                  : [],
+                repairId: row.repairId ? row.repairId.split(",") : [],
+                joinTeacherId: row.joinTeacherId
+                  ? row.joinTeacherId.split(",")
+                  : [],
+                educationId: row.educationId ? row.educationId.split(",") : [],
               };
             });
-             this.branchStatus = true;
+            this.branchStatus = true;
           }
         });
-      }else{
-          this.branchStatus = true;
+      } else {
+        this.branchStatus = true;
       }
     },
+    showCode(row) {
+      this.qrCodeUrl =
+        vaildStudentUrl() + "/project/register/index.html?organId=" + row.id;
+      this.codeStatus = true;
+      // qrCodeUrl:null,
+    },
   },
 };
 </script>

src/views/main/abnormal/index.vue

@@ -186,7 +186,7 @@ export default {
   async mounted() {
 
     await this.$store.dispatch("setBranchs");
-  this.$set(this.search,'organId',this.selects.branchs[0].id)
+  // this.$set(this.search,'organId',this.selects.branchs[0].id)
     this.FetchList();
   },
   methods: {

src/views/main/baseinfo/index.vue

@@ -175,7 +175,7 @@ export default {
  async mounted() {
     this.$set(this.search, "dates", this.getInitDate());
   await  this.$store.dispatch("setBranchs");
-  this.$set(this.search,'organId',this.selects.branchs[0].id)
+  // this.$set(this.search,'organId',this.selects.branchs[0].id)
     this.FetchDetail();
   },
   methods: {

src/views/main/reminders/index.vue

@@ -85,7 +85,7 @@ export default {
   },
   async mounted() {
     await this.$store.dispatch("setBranchs");
-    this.$set(this.search, "organId", this.selects.branchs[0].id);
+    // this.$set(this.search, "organId", this.selects.branchs[0].id);
     this.FetchList();
   },
   methods: {

src/views/main/schedule-branch/index.vue

@@ -136,7 +136,7 @@ export default {
  async mounted() {
   await  this.$store.dispatch("setBranchs");
   await  this.$store.dispatch("setTeachers");
-    this.$set(this.search, "organId", this.selects.branchs[0].id);
+    // this.$set(this.search, "organId", this.selects.branchs[0].id);
     this.FetchList();
   },
   methods: {