zhaoke 2 năm trước cách đây
mục cha
commit
d5bbfbdaf1
2 tập tin đã thay đổi với 15 bổ sung8 xóa
  1. 2 5
      src/views/newFlightView/index.vue
  2. 13 3
      src/views/newUserManagement/index.vue

+ 2 - 5
src/views/newFlightView/index.vue

@@ -123,11 +123,8 @@ export default {
     }
   },
   mounted () {
-    const { flightNo, flightDate } = this.flightObj
-    this.table1 = {
-      flightNo,
-      flightDate
-    }
+    this.table1 = this.dataContent
+    this.table2 = this.dataContent
   },
   methods: {
     // 获取基本信息

+ 13 - 3
src/views/newUserManagement/index.vue

@@ -59,8 +59,14 @@
               <el-form-item prop="user_group_name" label="账号组名称">
                 <el-input style="width:260px;margin-right: 30px;" size="small" v-model="formInline.user_group_name" placeholder="请输入账号组名称"></el-input>
               </el-form-item>
+              <el-form-item prop="up_user_group_name" label="上级用户组">
+                <el-select style="width:260px;margin-right: 30px;" size="small" clearable v-model="formInline.up_user_group_id" placeholder="请选择上级用户组">
+                  <el-option v-for="item in dataList" :key="item.user_group_id" :label="item.user_group_name" :value="item.user_group_id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item label="描述">
-                <el-input style="width:773px;" size="small" v-model="formInline.user_group_comment" placeholder="请输入描述"></el-input>
+                <el-input style="width:260px;" size="small" v-model="formInline.user_group_comment" placeholder="请输入描述"></el-input>
               </el-form-item>
             </el-form>
           </div>
@@ -189,6 +195,7 @@ import pb from '@/layout/mixin/getPublicData'
 import Dialog from '@/layout/components/Dialog'
 import pf from '@/layout/mixin/publicFunc'
 import MD5 from 'blueimp-md5'
+import { getToken } from '@/utils/auth'
 export default {
   name: 'NewManageMent',
   components: { Dialog },
@@ -211,7 +218,8 @@ export default {
       treeCheckId: '',
       formInline: {
         user_group_name: '',
-        user_group_comment: ''
+        user_group_comment: '',
+        up_user_group_id: ''
       },
       rules: {
         user_group_name: [{ required: true, message: '请输入账号组名称', trigger: 'blur' }],
@@ -269,7 +277,9 @@ export default {
   },
   methods: {
     async getTreeData () {
-      const { code, returnData } = await this.getQueryList(this.queryId)
+      const { code, returnData } = await this.getQueryList(this.queryId, [{
+        user_id: getToken('userid')
+      }])
       if (code == 0) {
         if (returnData && returnData.length) {
           this.arrs = [...returnData]