1

src/views/newUserManagement/index.vue

@@ -32,7 +32,7 @@
                 <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 label="描述">
-                <el-input style="width:360px;" size="small" v-model="formInline.user_group_comment" placeholder="请输入描述"></el-input>
+                <el-input style="width:773px;" size="small" v-model="formInline.user_group_comment" placeholder="请输入描述"></el-input>
               </el-form-item>
             </el-form>
           </div>
@@ -48,8 +48,8 @@
               </el-table-column>
               <el-table-column prop="user_status" label="状态">
               </el-table-column>
-              <el-table-column prop="token_valid_duration" label="令牌有效时长">
-              </el-table-column>
+              <!-- <el-table-column prop="token_valid_duration" label="令牌有效时长">
+              </el-table-column> -->
               <el-table-column prop="user_comment" label="描述">
               </el-table-column>
               <el-table-column label="操作" width="325">
@@ -106,9 +106,9 @@
             <el-form-item label="二级密码" prop="user_sec_pwd">
               <el-input v-model="ruleForm.user_sec_pwd" size="small" placeholder="请输入二级密码" />
             </el-form-item>
-            <el-form-item label="令牌有限期" prop="token_valid_duration">
+            <!-- <el-form-item label="令牌有限期" prop="token_valid_duration">
               <el-input v-model="ruleForm.token_valid_duration" size="small" placeholder="请输入令牌有限期(小时)" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="账号描述" prop="user_comment">
               <el-input v-model="ruleForm.user_comment" size="small" type="textarea" :rows="3" placeholder="请输入账号描述" />
             </el-form-item>
@@ -136,7 +136,7 @@
         </div>
         <div class="foot right t30">
           <!-- <el-button size="medium" class="r24" type="primary" @click="onCheck">确定</el-button> -->
-          <el-button size="medium" @click="hide">取消</el-button>
+          <el-button size="medium" @click="hide">关闭</el-button>
         </div>
       </div>
     </Dialog>
@@ -175,6 +175,7 @@ export default {
           user_group_name: '全部账号组',
           user_group_status: true,
           children: [],
+          disabled: true
         }
       ],
       treeCheckId: '',
@@ -224,6 +225,7 @@ export default {
       tableCols: [],
       dialogFlag: false,
       checkedKeysTemp: [],
+      userId: ''
     }
   },
   mounted () {
@@ -314,13 +316,14 @@ export default {
       this.$refs['form'].validate(async (valid) => {
         if (valid) {
           let code = null
+          this.formInline.user_group_id = this.treeCheckId
           const data = this.formInline
           if (this.type == 'add') {
-            code = await this.getChangeList(this.queryId, data, 1)
+            code = await this.getChangeList(this.queryId, data, 1, 'user_group_id')
           } else {
             const id = this.formInline.user_group_id
             if (id) {
-              code = await this.getChangeList(this.queryId, data, 2)
+              code = await this.getChangeList(this.queryId, data, 2,'user_group_id')
             }
           }
           if (code) {
@@ -340,10 +343,12 @@ export default {
       this.dataType = 'add'
       this.dataTitle = '新增账号'
       this.clearTableForm()
+      this.ruleForm.user_group_id = this.treeCheckId
     },
     handleTableEdit (row) {
       this.tableFlag = true
       this.dataType = 'edit'
+      this.userId = row.user_id
       this.dataTitle = '编辑账号'
       this.ruleForm = _.cloneDeep(row)
     },
@@ -372,6 +377,7 @@ export default {
       this.paswordFlag = true
       this.dataType = 'edit'
       this.dataTitle = '修改密码'
+      this.userId = row.user_id
       this.ruleForm = _.cloneDeep(row)
     },
     async handleTableDel (row) {
@@ -407,20 +413,21 @@ export default {
         if (valid) {
           let code = null
           const data = this.ruleForm
+          this.ruleForm.user_id = this.userId
           this.ruleForm.user_pwd= MD5(this.ruleForm.user_pwd)
           if (this.dataType == 'add') {
-            code = await this.getChangeList(SERVICE_ID.getUserTableId, data, 1)
+            code = await this.getChangeList(SERVICE_ID.getUserTableId, data, 1,'user_id')
           } else {
             const id = this.ruleForm.user_group_id
             if (id) {
-              code = await this.getChangeList(SERVICE_ID.getUserTableId, data, 2)
+              code = await this.getChangeList(SERVICE_ID.getUserTableId, data, 2,'user_id')
             }
           }
           if (code) {
             if (this.dataType == 'add') {
               this.clearTableForm()
             }
-            const result = await this.user_id(SERVICE_ID.getUserTableId, {
+            const result = await this.getQueryList(SERVICE_ID.getUserTableId, {
               user_group_id: this.formInline.user_group_id
             }, 'user_group_id')
             this.tableData = result