diff --git a/groups/forms.py b/groups/forms.py index cd6aabf3..36a7b857 100644 --- a/groups/forms.py +++ b/groups/forms.py @@ -13,14 +13,16 @@ class UserForm(forms.Form): ('1', "未删除"), ('0', "删除"), ) - username = forms.CharField(label="账号",max_length=30, widget=forms.TextInput()) - name = forms.CharField(label="姓名", max_length=20, widget=forms.TextInput()) - empid = forms.CharField(label="工号", max_length=20, widget=forms.TextInput()) - password = forms.CharField(label="密码", max_length=256, widget=forms.PasswordInput()) - ubelongpart = forms.ModelChoiceField(queryset=s_models.Partment.objects.all()) - openid = forms.CharField(label="公众号openid", max_length=200, widget=forms.TextInput()) - nickname = forms.CharField(label="昵称", max_length=200, widget=forms.TextInput()) - mpopenid = forms.CharField(label="小程序openid", max_length=200, widget=forms.TextInput()) - deletemark = forms.ChoiceField(label='删除标记', choices=mark) - headimgurl = forms.CharField(label="头像", max_length=200, required=False, widget=forms.TextInput()) - usecomp = forms.ModelChoiceField(queryset=s_models.Partment.objects.all())#所属公司 + + userid = forms.CharField(widget=forms.HiddenInput()) + username = forms.CharField(label="账号",max_length=30, widget=forms.TextInput(attrs={'class': 'form-control'})) + name = forms.CharField(label="姓名", max_length=20, widget=forms.TextInput(attrs={'class': 'form-control'})) + empid = forms.CharField(label="工号", max_length=20, widget=forms.TextInput(attrs={'class': 'form-control'})) + #password = forms.CharField(label="密码", max_length=256, widget=forms.PasswordInput()) + ubelongpart = forms.ModelChoiceField(label="ubelongpart", queryset=s_models.Partment.objects.all(), widget=forms.Select(attrs={'class': 'form-control'})) + openid = forms.CharField(label="公众号openid", max_length=200, widget=forms.TextInput(attrs={'class': 'form-control'})) + nickname = forms.CharField(label="昵称", max_length=200, widget=forms.TextInput(attrs={'class': 'form-control'})) + mpopenid = forms.CharField(label="小程序openid", max_length=200, widget=forms.TextInput(attrs={'class': 'form-control'})) + deletemark = forms.ChoiceField(label='删除标记', choices=mark, widget=forms.Select(attrs={'class': 'form-control'})) + #headimgurl = forms.CharField(label="头像", max_length=200, required=False, widget=forms.TextInput(attrs={'class': 'form-control'})) + usecomp = forms.ModelChoiceField(label="所属公司", queryset=s_models.Partment.objects.all(), widget=forms.Select(attrs={'class': 'form-control'})) diff --git a/groups/templates/groups/company_user.html b/groups/templates/groups/company_user.html index b75a7cc0..1a9324be 100644 --- a/groups/templates/groups/company_user.html +++ b/groups/templates/groups/company_user.html @@ -12,8 +12,8 @@ {% block pagehead %}

- 公司列表 - companys list + 公司员工列表 +

  1. 主页
    2. diff --git a/groups/templates/groups/company_userdetail.html b/groups/templates/groups/company_userdetail.html index 01f9bca6..cf86778a 100644 --- a/groups/templates/groups/company_userdetail.html +++ b/groups/templates/groups/company_userdetail.html @@ -1,10 +1,146 @@ - - - - - Title - - -

    uid={{ uid }}

    - - \ No newline at end of file +{% extends "./base.html" %} +{% load static %} +{% block headother%} + + + +{% endblock %} + + +{% block title %}员工信息{% endblock %} + +{% block pagehead %} +
    +

    + 员工信息 + +

    +
      +
    1. 主页
      2. +
    2. 员工信息
      3. +
    +
    +{% endblock %} +{% block content %} + +
    +
    + +
    + +
    +
    +

    员工信息

    +
    + + +
    + {% csrf_token %}{{ user_form.userid }} + {% if message %} +

    {{ message }}

    + {% endif %} +
    +
    + +
    + {{ user_form.username}} {{ user_form.username.errors }} +
    +
    +
    + +
    + {{ user_form.name}}{{ user_form.name.errors }} +
    +
    +
    + +
    + {{ user_form.empid}}{{ user_form.empid.errors }} +
    +
    +
    + +
    + {{ user_form.ubelongpart}}{{ user_form.ubelongpart.errors }} +
    +
    +
    + +
    + {{ user_form.openid}}{{ user_form.openid.errors }} +
    +
    +
    + +
    + {{ user_form.nickname}}{{ user_form.nickname.errors }} +
    +
    +
    + +
    + {{ user_form.headimgurl}}{{ user_form.headimgurl.errors }} +
    +
    +
    + +
    + {{ user_form.deletemark}}{{ user_form.deletemark.errors }} +
    +
    +
    + +
    + {{ user_form.mpopenid}}{{ user_form.mpopenid.errors }} +
    +
    +
    + +
    + {{ user_form.usecomp}}{{ user_form.usecomp.errors }} +
    +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    + +{% endblock %} + + +{% block endother%} + + + + + + + + + + +{% endblock %} + + diff --git a/groups/urls.py b/groups/urls.py index 36dc8931..13204a58 100644 --- a/groups/urls.py +++ b/groups/urls.py @@ -11,6 +11,7 @@ urlpatterns = [ path('company/', views.company, name='groups_company'), path('company/user//', views.company_user, name='groups_cuser'), path('company/userdetail//', views.company_userdetail, name='groups_userdetail'), + path('company/userupdate/', views.groups_userupdate, name='groups_userupdate'), path('trouble/', views.trouble, name='groups_trouble'),#隐患排查统计图 path('observe/', views.observe, name='groups_observe'),#行为观察统计图 diff --git a/groups/views.py b/groups/views.py index 3e5fdac3..eba6fb3c 100644 --- a/groups/views.py +++ b/groups/views.py @@ -2,9 +2,11 @@ from django.http import HttpResponse,JsonResponse from django.shortcuts import render from django.shortcuts import redirect from .models import Group,GroupUser -from .forms import GroupUserForm +from .forms import GroupUserForm, UserForm from safesite import models as s_models from safesite.tasks import gettime +from django.forms.models import model_to_dict +from django.http import Http404 import requests import json import time @@ -81,8 +83,37 @@ def company_user(request, cid): return render(request, 'groups/company_user.html', locals()) def company_userdetail(request, uid): + try: + user = s_models.User.objects.get(pk=uid) + except s_models.User.DoesNotExist: + raise Http404("User does not exist") + user_form = UserForm(model_to_dict(user)) + # print(type(user)) + # print(user_form) + # dump(user) return render(request, 'groups/company_userdetail.html', locals()) +def groups_userupdate(request): + if request.method == 'POST': + user_form = UserForm(request.POST) + if user_form.is_valid(): + model_user = s_models.User() + model_user.userid = user_form.cleaned_data.get('userid') + model_user.username = user_form.cleaned_data.get('username') + model_user.name = user_form.cleaned_data.get('name') + model_user.empid = user_form.cleaned_data.get('empid') + model_user.ubelongpart = user_form.cleaned_data.get('ubelongpart') + model_user.openid = user_form.cleaned_data.get('openid') + model_user.nickname = user_form.cleaned_data.get('nickname') + model_user.headimgurl = user_form.cleaned_data.get('headimgurl') + model_user.deletemark = user_form.cleaned_data.get('deletemark') + model_user.mpopenid = user_form.cleaned_data.get('mpopenid') + model_user.usecomp = user_form.cleaned_data.get('usecomp') + model_user.save() + return render(request, 'groups/company_userdetail.html', locals()) + else: + return redirect('/groups/company/') + def dump(obj): print('\n'.join(['%s:%s' % item for item in obj.__dict__.items()]))