Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/api/sale/sale.js

@@ -202,3 +202,16 @@ export function getClassOrderLogList(data) {
     data
   })
 }
+
+
+/**
+ *  获取班级订单列表
+ *
+ */
+export function quertClassOrderList(data) {
+    return request({
+      url: '/order/GetClassOrderList',
+      method: 'post',
+      data
+    })
+  }
\ No newline at end of file

src/components/sale/orderitem.vue

+<template>
+    <tbody>
+    </tbody>
+</template>

src/components/school/manager/employee-info.vue

@@ -98,8 +98,31 @@
           </div>
         </div>
         <div>
-          <q-btn label="调岗" color="accent q-px-md" size="10px" style="font-weight:400 !important;margin-right:10px;" />
-          <q-btn label="调部门" color="accent q-px-md" size="10px" style="font-weight:400 !important;" />
+          <q-btn label="调岗" color="accent q-px-md" size="10px" @click="isShowJobPop=true" style="font-weight:400 !important;margin-right:10px;">
+            <q-popup-proxy>
+              <q-banner v-if="isShowJobPop">
+                <div style="width:300px;padding-bottom:20px;">
+                  <div style="margin:10px 0 15px 0;">调岗</div>
+                  <q-select filled stack-label option-value="PostId" option-label="PostName" v-model="Post_Id" ref="Post_Id"
+                  :options="PostList" label="岗位" :dense="false" class="col-6 q-pb-lg" emit-value map-options />
+                  <q-btn color="primary" label="确定" style="width:100%;" @click="savePost()" />
+                </div>
+              </q-banner>
+            </q-popup-proxy>
+          </q-btn>
+          <q-btn label="调部门" color="accent q-px-md" size="10px" @click="isShowDepPop=true" style="font-weight:400 !important;">
+            <q-popup-proxy>
+              <q-banner v-if="isShowDepPop">
+                <div style="width:300px;padding-bottom:20px;">
+                  <div style="margin:10px 0 15px 0;">调部门</div>
+                  <selectTree :treeData='DeptList' :defaultArray="returnString" nodeKey="DeptId" :multiple="false"
+                    labelKey="DeptName" childrenKey="ChildList" tipText="选择部门" @getChild="getChild"
+                    classStr="col-6 q-pb-lg"></selectTree>
+                  <q-btn color="primary" label="确定" style="width:100%;" @click="saveDepart()" />
+                </div>
+              </q-banner>
+            </q-popup-proxy>
+          </q-btn>
         </div>
       </div>
       <div class="Emloyee_CompanyInfo">
@@ -149,11 +172,23 @@
 </template>
 
 <script>
+  import {
+    UpdateEmployeeLeave,
+    UpdateEmployeeDept,
+    UpdateEmployeePost
+  } from '../../../api/users/user'
+  import {
+    getDeptTree
+  } from '../../../api/system/dept.js'
+  import {
+    queryDeptPostList
+  } from '../../../api/system/post'
   import employeeDetails from '../manager/employee_details';
   import employeeRemark from '../manager/employee-remark';
   import employeeLog from '../manager/employee_log';
   import employeeFile from '../manager/employee_file';
   import employeeFinace from '../manager/employee_finace';
+  import selectTree from '../../common/select-tree'
   export default {
     props: {
       saveObj: {
@@ -166,7 +201,8 @@
       employeeRemark,
       employeeLog,
       employeeFile,
-      employeeFinace
+      employeeFinace,
+      selectTree
     },
     data() {
       return {
@@ -174,6 +210,10 @@
         tabCheck: 0, //默认选第一个
         loading: false,
         checkedIndex:0,
+        setObj: {
+          type: 0,
+          selected: []
+        },
         menuList:[{
           name:'行政备注',
           id:0
@@ -189,12 +229,23 @@
         },{
           name:'财务单据',
           id:4
-        }]
+        }],
+        isShowJobPop:false,
+        PostList:[],  //岗位下拉数据
+        Post_Id: 0, //岗位
+
+        isShowDepPop:false,
+        DeptList:[], //部门数据
+        returnString: [], //部门默认
+        departId: -2, // 部门
       }
     },
     created() {},
     mounted() {
       console.log("aaa", this.saveObj);
+      // this.Post_Id = this.saveObj.Post_Id
+      this.queryPostList();
+      this.getDepartList();
     },
     methods: {
       closeShenheForm() {
@@ -206,6 +257,92 @@
         this.checkedIndex=index;
         this.tabCheck=item.id;
       },
+      //获取岗位下拉
+      queryPostList() {
+        var postMsg = {
+          QDeptIds: this.saveObj.Dept_Id
+        };
+        queryDeptPostList(postMsg).then(res => {
+          if (res.Code == 1) {
+            this.PostList = res.Data;
+            let obj = {
+              PostName:'不限',
+              PostId:0
+            }
+            this.PostList.unshift(obj);
+          }
+        })
+      },
+      //保存修改岗位
+      savePost(){
+        if (this.Post_Id == 0) {
+            this.$q.notify({
+              type: 'negative',
+              position: "top",
+              message: `请选择岗位`
+            })
+            return;
+          }
+          let obj = {};
+          if (this.saveObj) {
+            obj.Id = this.saveObj.Id;
+            obj.AccountId = this.saveObj.AccountId;
+            obj.AccountType = this.saveObj.AccountType;
+            obj.Post_Id = this.Post_Id;
+          }
+          UpdateEmployeePost(obj).then(res => {
+            if (res.Code == 1) {
+              this.isShowJobPop=false;
+              this.closeShenheForm=false;
+              this.$emit('close');
+              this.$emit('success');
+            }
+          })
+      },
+      //选择部门
+      getChild(deptArray) {
+        if (deptArray && deptArray != '') {
+          this.departId = deptArray;
+        }
+      },
+      //获取部门下拉数据
+      getDepartList() {
+        let msg = {
+          School_Id: this.saveObj.School_Id
+        }
+        getDeptTree(msg).then(res => {
+          if (res.Code == 1) {
+            this.DeptList = res.Data;
+          }
+        })
+      },
+      //保存部门
+      saveDepart(){
+        let Msg = [];
+        if (this.departId == -2) {
+          this.$q.notify({
+            type: 'negative',
+            position: "top",
+            message: `请选择部门`
+          })
+          return;
+        }
+        let obj = {};
+        if (this.saveObj) {
+          obj.Id = this.saveObj.Id;
+          obj.AccountId = this.saveObj.AccountId;
+          obj.AccountType = this.saveObj.AccountType;
+          obj.Dept_Id = this.departId;
+        }
+        UpdateEmployeeDept(obj).then(res => {
+          if (res.Code == 1) {
+            this.isShowDepPop=false;
+            this.closeShenheForm=false;
+            this.$emit('success');
+            this.$emit('close')
+          }
+        })
+      }
     },
   }
 

src/components/school/manager/employee-set.vue

@@ -131,8 +131,8 @@
           </div>
         </div>
       </div>
-      <div style="text-align:center">
-        <q-btn color="primary" label="确定" @click="saveReuslt()" style="width:400px;" />
+      <div style="text-align:left;margin-left:20px;">
+        <q-btn color="primary" label="确定" @click="saveReuslt()" style="width:300px;" />
       </div>
     </q-card>
     <div class="dialog-out-close" @click="closeShenheForm"
@@ -211,7 +211,12 @@
         };
         queryDeptPostList(postMsg).then(res => {
           if (res.Code == 1) {
+            let obj = {
+              PostName:'不限',
+              PostId:0
+            }
             this.PostList = res.Data;
+            this.PostList.unshift(obj);
           }
         })
       },

src/router/routes.js

@@ -102,6 +102,11 @@ const routes = [{
         component: () =>
           import("pages/course/classManage.vue")
       },
+      {
+        path: "/course/classorder", //班级订单
+        component: () =>
+          import("pages/course/classorder.vue")
+      },
       {
         path: "/course/teachplan", //教案管理
         component: () =>