From e4d32db4d283a638fd6b29da9f0863ca24096fd3 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sat, 21 Sep 2019 09:25:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E5=92=8C=E5=85=AC=E5=8F=B8=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/daoru.py                              |  2 +-
 safesite/forms.py                              |  1 -
 safesite/migrations/0270_auto_20190920_1200.py | 17 +++++++++++++++++
 safesite/models.py                             |  1 -
 safesite/templates/companyinfo.html            |  1 -
 5 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 safesite/migrations/0270_auto_20190920_1200.py

diff --git a/safesite/daoru.py b/safesite/daoru.py
index 46f8cd94..b0ce039e 100644
--- a/safesite/daoru.py
+++ b/safesite/daoru.py
@@ -283,7 +283,7 @@ def drrisks(companyid,path):
                         if users.exists():
                             obj.zrr = users[0] 
                     obj.save()
-                    obj.qrcode = makeqr3('https://safeyun.ctcshe.com/miniprogram/riskact?id='+str(obj.id))
+                    obj.qrcode = makeqr_riskact('https://safeyun.ctcshe.com/miniprogram/riskact?id='+str(obj.id))
                     obj.save()
                     a = Risk()
                     a.riskact=obj
diff --git a/safesite/forms.py b/safesite/forms.py
index 2c342ee6..147d9f7c 100644
--- a/safesite/forms.py
+++ b/safesite/forms.py
@@ -19,6 +19,5 @@ class CompanyInfoForm(forms.Form):
     legalperson_phone = forms.CharField(max_length=24, label='法人电话', widget=forms.TextInput(attrs={'size': '50'}))
     liaison = forms.CharField(max_length=24, label='联系人', widget=forms.TextInput(attrs={'size': '50'}))
     liaison_phone = forms.CharField(max_length=24, label='联系人电话', widget=forms.TextInput(attrs={'size': '50'}))
-    liaison_fax = forms.CharField(max_length=13, label='联系人传真', widget=forms.TextInput(attrs={'size': '50'}))
     introduce = forms.CharField(label='公司概况', widget=forms.Textarea)
 
diff --git a/safesite/migrations/0270_auto_20190920_1200.py b/safesite/migrations/0270_auto_20190920_1200.py
new file mode 100644
index 00000000..14f34fdb
--- /dev/null
+++ b/safesite/migrations/0270_auto_20190920_1200.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.1.5 on 2019-09-20 12:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('safesite', '0269_auto_20190919_1423'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='companyinfo',
+            name='liaison_fax',
+        ),
+    ]
diff --git a/safesite/models.py b/safesite/models.py
index e572a1fc..d7b1815f 100644
--- a/safesite/models.py
+++ b/safesite/models.py
@@ -830,7 +830,6 @@ class CompanyInfo(models.Model):
     legalperson_phone = models.CharField(max_length=24, null=True, blank=True, verbose_name='法人电话')
     liaison = models.CharField(max_length=24, verbose_name='联系人')
     liaison_phone = models.CharField(max_length=24, verbose_name='联系人电话')
-    liaison_fax = models.CharField(max_length=10, null=True, blank=True, verbose_name='联系人传真')
     introduce = models.TextField( null=True, blank=True, verbose_name='公司概况')
     createtime = models.DateTimeField(auto_now_add=True)
     modifytime = models.DateTimeField(auto_now=True)
diff --git a/safesite/templates/companyinfo.html b/safesite/templates/companyinfo.html
index 97c3f746..2ea4c098 100644
--- a/safesite/templates/companyinfo.html
+++ b/safesite/templates/companyinfo.html
@@ -1,4 +1,3 @@
-<div class="labeldiv" style="margin:10px">公司信息</div>
 <form method="post" action="/companyinfo/" id="companyform">
     {% csrf_token %}
     {{ companyinfo.non_field_errors }}