diff --git a/safesite/migrations/0266_auto_20190917_2314.py b/safesite/migrations/0266_auto_20190917_2314.py
new file mode 100644
index 00000000..06bf3363
--- /dev/null
+++ b/safesite/migrations/0266_auto_20190917_2314.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.1.5 on 2019-09-17 23:14
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('safesite', '0265_auto_20190917_1716'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='area',
+            name='qrcode',
+            field=models.CharField(blank=True, max_length=200, null=True),
+        ),
+    ]
diff --git a/safesite/templates/riskactedit.html b/safesite/templates/riskactedit.html
index 29485e46..2f16addf 100644
--- a/safesite/templates/riskactedit.html
+++ b/safesite/templates/riskactedit.html
@@ -39,6 +39,10 @@
                 <input id="jtwz" class="easyui-textbox" name="place" style="width:480px" data-options="label:'具体位置'"
                 />
             </div>
+            <div style="margin-top:10px;margin-bottom:5px">
+                <input id="group" class="easyui-combobox" name="group" style="width:480px" data-options="label:'所属岗位',url:'grouphandle?a=combobox'"
+                    required=true editable=false/>
+            </div>
             <div style="margin-top:10px;margin-bottom:5px">
                     <select id="gkcj" class="easyui-combobox" name="gkcj" style="width:480px" data-options="label:'管控层级'"
                         required=true editable=false>
@@ -80,7 +84,7 @@
         $('#fxdmc').textbox('setValue',data.name)
         $('#jtwz').textbox('setValue',data.place)
         $('#qrcode').attr('src',data.qrcode)
-        $('#group').combobox('setValue', res.group__groupid)
+        $('#group').combobox('setValue', data.group__groupid)
         $("#zrbm").combotree({ 
             url: 'parthandle?a=tree', 
             onSelect: function (node) { 
diff --git a/safesite/views.py b/safesite/views.py
index 4ea26bbf..7cd92c75 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -4157,6 +4157,35 @@ def apioperation(req):
         oldjdmc = obj.zyzt['jdmc']
         nextindex =  obj.zyzt['index']+1
         spruser = User.objects.get(userid=userid)
+        if req.POST.get('zzsp',None):
+            obj.zyzt['zyzt'] = '待关闭'
+            obj.todouser = obj.zyfzr
+            obj.todousers = None
+            obj.save()
+            Operspxq.objects.create(oper=Operation.objects.get(zyid=zyid),jdmc=oldjdmc,spr=spruser,checked=1,spbm=spruser.ubelongpart)
+            postdict={
+            'touser':'',
+            'template_id':obj.zyfzr.openid,
+            'data':{
+                'first':{
+                    'value':obj.zylx.dickeyname + '作业审批通过:'
+                    },
+                'keyword1':{
+                    'value':obj.zynr
+                    },
+                'keyword2':{
+                    'value':obj.kssj
+                    },
+                'keyword3':{
+                    'value':obj.zydd
+                    },
+                'remark':{
+                    'value':'你是作业负责人,可以开始作业,作业完成请及时关闭!'
+                    }
+                }
+            }
+            send_wechatmsg.delay(postdict)
+            return JsonResponse({"code":1})
         try:
             nextsplc =  obj.zyzt['splc'][nextindex]
             obj.zyzt['zyzt'] = '审批中'