diff --git a/safesite/migrations/0296_auto_20191206_1559.py b/safesite/migrations/0296_auto_20191206_1559.py new file mode 100644 index 00000000..0de6373e --- /dev/null +++ b/safesite/migrations/0296_auto_20191206_1559.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.8 on 2019-12-06 15:59 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0295_auto_20191205_1702'), + ] + + operations = [ + # migrations.RemoveField( + # model_name='companyinfo', + # name='liaison_fax', + # ), + migrations.RemoveField( + model_name='operation', + name='issimple', + ), + ] diff --git a/safesite/models.py b/safesite/models.py index 5c2fa554..d90f696c 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -471,7 +471,6 @@ class Operation(models.Model):#作业表 zyimg = models.CharField(max_length=1000,default='') zyimg2 = models.CharField(max_length=1000,default='') deletemark = models.IntegerField(default='1') - issimple = models.IntegerField(default=1) zyzt = JSONField() fxcs = models.CharField(max_length=200) todouser = models.ForeignKey(User,related_name='zyclr',on_delete=models.CASCADE,null=True,blank=True) diff --git a/safesite/static/safesite/mystatic/js/util.js b/safesite/static/safesite/mystatic/js/util.js index c921e5ca..685679b2 100644 --- a/safesite/static/safesite/mystatic/js/util.js +++ b/safesite/static/safesite/mystatic/js/util.js @@ -349,6 +349,22 @@ function choseusers(x) { }); $('#userdd').window('center'); } +function choseuser(x) { + var x = x || 'lecturer'; + var myh = screen.availHeight * 0.7; + $('#userdd').dialog({ + maximizable: true, + title: '选择人员', + width: 900, + height: myh, + closed: false, + cache: false, + href: 'getuserf?a=' + x, + modal: true, + border: false, + }); + $('#userdd').window('center'); +} //导出excel function JSONToCSVConvertor(JSONData, ReportTitle, ShowLabel) { //If JSONData is not an object then JSON.parse will parse the JSON string in an Object diff --git a/safesite/templates/operation.html b/safesite/templates/operation.html index 184e534f..937fdb5d 100644 --- a/safesite/templates/operation.html +++ b/safesite/templates/operation.html @@ -1,7 +1,7 @@