Merge branch 'dev' of http://124.225.116.118:35236/tj_django/datacenter into dev

sales/forms.py

@@ -390,6 +390,7 @@ class Activity_Lottery_Plan_Form(ModelForm):
         fields = '__all__'
         widgets = {
             'company': forms.HiddenInput(),
+            'win_scan_num': forms.Textarea(attrs={'placeholder': ('多个用户id请用英文,号隔开,不能超过20个')})
         }
     def __init__(self, *args, **kwargs):
         self._user = kwargs.pop('user')

sales/views.py

@@ -9851,6 +9851,7 @@ def activity_lottery_plan_list(request):
 # 单枚布奖
 @login_required
 def activity_lottery_plan_edit(request, id=None):
+    e = ''
     if id:
         obj = Activity_Lottery_Plan.objects.get(id=int(id))
     else:
@@ -9868,21 +9869,32 @@ def activity_lottery_plan_edit(request, id=None):
         remark = request.POST.get('remark', '')
         batch_no = request.POST.get('batch_no', None)
         company_id = request.user.company.id
+        #lisin 修改成批量
+        if win_scan_num:
+            win_scan_num = [int(num) for num in win_scan_num.split(',')]
+            if(len(win_scan_num) > 2):
+                e = '设置数量不能超过20个'
+                return render(request, 'sales/activity_lottery_plan.html', {e : e})
+        
         if tm_start and tm_end and win_scan_num and activity and award:
+            # 创建对象列表
+            activity_lottery_plans = [
+                Activity_Lottery_Plan(
+                    company_id=company_id,
+                    activity_id=activity,
+                    tm_start=tm_start,
+                    tm_end=tm_end,
+                    win_scan_num=num,
+                    award_id=award,
+                    remark=remark,
+                    batch_no=batch_no
+                )
+                for num in win_scan_num
+            ]
+            # 使用 bulk_create 批量保存对象
+            Activity_Lottery_Plan.objects.bulk_create(activity_lottery_plans)
 
-            obj = Activity_Lottery_Plan()
-            obj.company_id = company_id
-            obj.activity_id = activity
-            obj.tm_start = tm_start
-            obj.tm_end = tm_end
-            obj.win_scan_num = win_scan_num
-            obj.award_id = award
-            obj.remark = remark
-            obj.batch_no = batch_no
-
-            obj.save()
-
-    return render(request, 'sales/activity_lottery_plan.html', {'form': form})
+    return render(request, 'sales/activity_lottery_plan.html', {'form': form, e: e})
     
 @login_required
 def activity_lottery_plan_delete(request, id=None):

templates/sales/activity_lottery_plan.html

@@ -29,6 +29,11 @@
         border: none;
         border-bottom: 1px solid gray;
     }
+
+    textarea {
+        width: 100%;
+        height: 100px;
+    }
 </style>
 
 <div class="alert alert-success" role="alert" style="display: none">保存成功！</div>