Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-antd

src/views/activiti/user-model/modules/ActivitiUserModelTable.vue

@@ -27,7 +27,7 @@
     <template slot="footer">
       <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
     </template>
-    <base-form ref="baseModal" @ok="handleOk"/>
+    <base-form ref="baseModal" :roleList="roleList" @ok="handleOk"/>
     <detail ref="detailModal" @ok="handleOk"/>
   </a-modal>
 </template>
@@ -40,6 +40,7 @@ import {
 } from '@/api/activiti/user-model'
 import BaseForm from './BaseForm'
 import Detail from './Detail'
+import { queryRole } from '@/api/upms/role'
 
 export default {
   name: 'ActivitiUserModelTable',
@@ -49,6 +50,7 @@ export default {
   },
   data () {
     return {
+      roleList: [],
       confirmLoading: false,
       modalTitle: null,
       form: this.$form.createForm(this),
@@ -121,8 +123,14 @@ export default {
   created () {
     // 下拉框map
     this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.ACTIVITI_USER_MODEL_TYPE)
+    this.getRoles()
   },
   methods: {
+    getRoles () {
+      queryRole({ status: 1 }).then(res => {
+        this.roleList = res.data
+      })
+    },
     base (record) {
       this.visible = true
       this.model = record

src/views/repair/application-form/modules/AssignForm.vue

@@ -85,11 +85,13 @@ export default {
       this.record = record
     },
     getDeptUsers () {
-      queryUserDept({ deptCode: this.DictCache.VALUE.SYS_DEPT_CODE.XIAN_CHANG_WEI_XIU_ZU, userStatus: 1 }).then(res => {
-        queryUserDept({ deptCode: this.DictCache.VALUE.SYS_DEPT_CODE.CHANG_NEI_WEI_XIU_ZU, userStatus: 1 }).then(res2 => {
-          this.deptUserList = res.data.concat(res2.data)
-        })
+      queryUserDept({ userStatus: 1 }).then(res => {
+        // queryUserDept({ userStatus: 1 }).then(res2 => {
+        this.deptUserList = res.data
+        console.log("role11")
+        console.log(this.deptUserList)
       })
+      // })
     },
     getUsers () {
       queryUser({ status: 1 }).then(res => {