<<<<<<< HEAD print('nimei') form = ApprovalForm() list_subject = [(1, u'公务卡消费'), (2, u'非公务卡消费')] form.cost_type.choices = list_subject form.subject.choices = Subject.get_subjects() print 'nimeimei' ======= form = ApprovalForm(request.form) form.status.choices = Approval.get_status() form.approval_type.choices = Approval.get_approval_type() >>>>>>> 797deb1d9a238a9098207cfc01bab6963414987f if request.method == 'POST' and form.validate(): approval = Approval() approval.agent_id = Person.judge(form.agent.data) approval.payee_id = Person.judge(form.payee.data) <<<<<<< HEAD approval.subject_list = dict(Subject.get_subjects())[form.subject] db.session.add(approval) approval.save() form_list = [form.cost_type, approval.agent_id, form.max_money, approval.id, form.subject] invoices = Invoice.find_relation(form_list) if invoices[1] == None: approval_index = Approval.query.get(approval.id) approval_index.invoice_count = invoices[0] approval_index.subject_list += (' '+dict(Subject.get_subjects())[form.subject]) approval_index.status = 'Printed' approval.save() flash(u'组合成功') return redirect('/approval/%d' % int(approval.id))