diff --git a/groups/forms.py b/groups/forms.py index 0f5ebf25..51ef4e36 100644 --- a/groups/forms.py +++ b/groups/forms.py @@ -13,15 +13,17 @@ class UserForm(forms.Form): ('0', "删除"), ) - userid = forms.CharField(widget=forms.HiddenInput(), disabled=True) - 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'})) + userid = forms.CharField(widget=forms.HiddenInput()) + username = forms.CharField(label="账号",max_length=30, widget=forms.TextInput(attrs={'class': 'form-control'}), required=False) + name = forms.CharField(label="姓名", max_length=20, widget=forms.TextInput(attrs={'class': 'form-control'}), required=False) empid = forms.CharField(label="工号", max_length=20, widget=forms.TextInput(attrs={'class': 'form-control'}), required=False) #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'}), required=False) nickname = forms.CharField(label="昵称", max_length=200, widget=forms.TextInput(attrs={'class': 'form-control'}), required=False) mpopenid = forms.CharField(label="小程序openid", max_length=200, widget=forms.TextInput(attrs={'class': 'form-control'}), required=False) - deletemark = forms.ChoiceField(label='删除标记', choices=mark, widget=forms.Select(attrs={'class': 'form-control'})) + deletemark = forms.ChoiceField(label='删除标记', choices=mark, widget=forms.Select(attrs={'class': 'form-control'}), required=False) #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 38e4d7a6..954b557c 100644 --- a/groups/templates/groups/company_user.html +++ b/groups/templates/groups/company_user.html @@ -54,7 +54,10 @@ {{user.name}} {{user.username}} {{user.empid}} - 查看 + + 查看 + 公司调整 + {% endfor %} diff --git a/groups/templates/groups/company_userchange.html b/groups/templates/groups/company_userchange.html new file mode 100644 index 00000000..cb4437c4 --- /dev/null +++ b/groups/templates/groups/company_userchange.html @@ -0,0 +1,99 @@ +{% 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.errors }} +
+
+ +
+ {{ user_form.usecomp}}{{ user_form.usecomp.errors }} +
+
+
+ +
+ {{ user_form.ubelongpart}}{{ user_form.ubelongpart.errors }} +
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +{% endblock %} + + +{% block endother%} + + + + + + + + + + +{% endblock %} + + diff --git a/groups/templates/groups/company_userdetail.html b/groups/templates/groups/company_userdetail.html index 5475790e..c6413da9 100644 --- a/groups/templates/groups/company_userdetail.html +++ b/groups/templates/groups/company_userdetail.html @@ -34,7 +34,7 @@ -
+ {% csrf_token %}{{ user_form.userid }} {% if message %}

{{ message }}

diff --git a/groups/test.py b/groups/test.py new file mode 100644 index 00000000..e69de29b diff --git a/groups/urls.py b/groups/urls.py index b7c26cbc..e1f41c27 100644 --- a/groups/urls.py +++ b/groups/urls.py @@ -12,6 +12,8 @@ urlpatterns = [ 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('company/userchange//', views.company_userchange_page, name='groups_change_company'), + 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 7a297cbd..ea1df17e 100644 --- a/groups/views.py +++ b/groups/views.py @@ -86,34 +86,57 @@ def company_userdetail(request, uid): user = s_models.User.objects.get(pk=uid) except s_models.User.DoesNotExist: raise Http404("User does not exist") - UserForm.companys = s_models.Partment.objects.filter(group__id=1) + + #UserForm.set_usecomp(s_models.Partment.objects.all()) 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()) + if user_form.is_valid(): + model_user = s_models.User.objects.filter(pk=user_form.cleaned_data.get('userid'))[0] + if model_user: + # model_user.ubelongpart = user_form.cleaned_data.get('ubelongpart') + # model_user.usecomp = user_form.cleaned_data.get('usecomp') + # model_user.save() + + newpart = user_form.cleaned_data.get('ubelongpart') + oldpart = model_user.ubelongpart + + oldpart.aqy = oldpart.aqy.replace(',' + str(model_user.userid) + ',', '') + oldpart.bmzg = oldpart.bmzg.replace(',' + str(model_user.userid) + ',', '') + oldpart.bsq = oldpart.bsq.replace(',' + str(model_user.userid) + ',', '') + oldpart.save() + part = s_models.Partment.objects.get(partid=newpart.partid) + + if part.iscompany == 1: + usecomp = part + else: + usecomp = s_models.Partment.objects.get(partid=part.partlink.split(',')[1]) + model_user.ubelongpart = part + model_user.usecomp = usecomp + model_user.save() + + for i in s_models.Group.objects.filter(usecomp=usecomp): + i.users.remove(model_user) + groupobj = s_models.Group.objects.filter(usecomp=usecomp, grouptype=3).first() + groupobj.users.add(model_user) + else: + message = '没有发现该用户' + return render(request, 'groups/company_userchange.html', locals()) else: return redirect('/groups/company/') +def company_userchange_page(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)) + + return render(request, 'groups/company_userchange.html', locals()) + def dump(obj): print('\n'.join(['%s:%s' % item for item in obj.__dict__.items()])) diff --git a/safesite.lnk b/safesite.lnk new file mode 100644 index 00000000..129596d1 Binary files /dev/null and b/safesite.lnk differ