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

src/api/system/index.js

@@ -378,12 +378,22 @@ export function GetClassTypeList(data) {
 
 /**
  * 获取退课流程设置
-*/
-export function queryBackClassFlow(data)
-{
-    return request({
-        url: '/Flow/GetBackClassFlow',
-        method: 'post',
-        data
-      });
-}
\ No newline at end of file
+ */
+export function queryBackClassFlow(data) {
+  return request({
+    url: '/Flow/GetBackClassFlow',
+    method: 'post',
+    data
+  });
+}
+
+/**
+ * 保存退课流程设置
+ */
+export function saveBackClassFlow(data) {
+  return request({
+    url: '/Flow/SetBackClassFlow',
+    method: 'post',
+    data
+  });
+}

src/components/system/process-form.vue

@@ -151,7 +151,8 @@
             <div style="margin:10px 0;">
               <q-select class="col-6 q-pb" v-if="aItem.AuditType==2" clearable filled stack-label use-input
                 option-value="Id" option-label="EmployeeName" v-model="aItem.UserId" ref="ManagerId"
-                :options="EmployeeList" label="指定人员名称" :dense="false" emit-value map-options @filter="filterFn">
+                :options="EmployeeList" label="指定人员名称" :dense="false" emit-value map-options @filter="filterFn"
+                @input="changeType(aItem)">
                 <template v-slot:no-option>
                   <q-item>
                     <q-item-section class="text-grey">
@@ -162,7 +163,7 @@
               </q-select>
               <q-select class="col-6 q-pb" v-if="aItem.AuditType==3" clearable filled stack-label use-input
                 option-value="Id" option-label="Name" v-model="aItem.PostType" ref="ManagerId" :options="roleList"
-                label="选择角色" :dense="false" emit-value map-options>
+                label="选择角色" :dense="false" emit-value map-options @input="changeType(aItem)">
               </q-select>
             </div>
             <q-toggle v-if="saveObj.FlowAduitList&&saveObj.FlowAduitList.length>0 && aIndex==0"
@@ -245,9 +246,28 @@
       this.getEmployee();
     },
     mounted() {
-      console.log("saveObj", this.saveObj);
+
     },
     methods: {
+      //选择切换
+      changeType(item) {
+        //指定人员
+        if (item.AuditType == 2) {
+          var chooseUser = this.AllemployeeList.filter(v => v.Id == item.UserId);
+          if (chooseUser && chooseUser.length > 0) {
+            item.AduitName = chooseUser[0].EmployeeName;
+            item.PostType = 0;
+          }
+        }
+        //内置角色
+        else if (item.AuditType == 3) {
+          var chooseRole = this.roleList.filter(v => v.Id == item.PostType);
+          if (chooseRole && chooseRole.length > 0) {
+            item.AduitName = chooseRole[0].Name;
+            item.UserId = 0;
+          }
+        }
+      },
       //新增审核人
       AddAduitInfo() {
         this.saveObj.FlowAduitList.push({
@@ -299,5 +319,4 @@
       },
     }
   }
-
-</script>
+</script>
\ No newline at end of file

src/pages/system/processSet.vue

@@ -128,8 +128,9 @@
       </div>
       <template v-for="(item,index) in flowObj.FlowNodeList">
         <div class="processList" @click="getItem(item)">
+          <a @click="DeleteNode(index)">删除</a>
           <template v-if="item.FlowAduitList&&item.FlowAduitList.length==1">
-            <div class="processTop otherList">{{item.NodeName}}</div>
+            <div class="processTop otherList">{{item.FlowAduitList[0].AduitName}}</div>
             <div class="processLine" v-if="index!=flowObj.FlowNodeList.length-1">
               <i class="iconfont icon-down"></i>
             </div>
@@ -161,7 +162,7 @@
       <div class="addProcessBtn">新增节点</div>
       <div class="process_BtnList">
         <div class="process_BtnOne">日志信息</div>
-        <q-btn label="保存" color="accent q-px-md" style="font-weight:400 !important" />
+        <q-btn label="保存" color="accent q-px-md" style="font-weight:400 !important" @click="setBackClassFlow" />
       </div>
     </div>
     <process-form v-if="isShowProcess" :save-obj="processObj" @close="closeProcessForm" @success="refreshPage">
@@ -171,7 +172,8 @@
 <script>
   import processForm from '../../components/system/process-form';
   import {
-    queryBackClassFlow
+    queryBackClassFlow,
+    saveBackClassFlow
   } from '../../api/system/index'
   export default {
     components: {
@@ -189,8 +191,8 @@
         flowObj: {
           FlowId: 1,
           FlowName: "退课流程",
-          FlowNodeList: [],
-        }, //流程列表
+          FlowNodeList: [], //审核节点列表
+        },
       }
     },
     created() {},
@@ -198,6 +200,10 @@
       this.getBackClassFlow();
     },
     methods: {
+      //删除节点
+      DeleteNode(index) {
+        this.flowObj.FlowNodeList.splice(index, 1);
+      },
       getBackClassFlow() {
         queryBackClassFlow(this.msg).then(res => {
           if (res.Code == 1) {
@@ -217,7 +223,23 @@
       //成功刷新
       refreshPage() {
         this.isShowProcess = false;
+        this.processObj = {};
         this.getBackClassFlow();
+      },
+      //保存退课流程
+      setBackClassFlow() {
+        saveBackClassFlow(this.flowObj).then(res => {
+          if (res.Code == 1) {
+            this.$q.notify({
+              icon: 'iconfont icon-chenggong',
+              color: 'accent',
+              timeout: 2000,
+              message: '操作成功',
+              position: 'top'
+            })
+            this.refreshPage();
+          }
+        })
       }
     }
   }