diff --git a/business/migrations/0008_alter_case_paymentcollection.py b/business/migrations/0008_alter_case_paymentcollection.py new file mode 100644 index 0000000..75609fc --- /dev/null +++ b/business/migrations/0008_alter_case_paymentcollection.py @@ -0,0 +1,16 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("business", "0007_add_case_change_request_model"), + ] + + operations = [ + migrations.AlterField( + model_name="case", + name="paymentcollection", + field=models.CharField(blank=True, default="", max_length=100, verbose_name="已收款"), + ), + ] diff --git a/business/migrations/0009_alter_case_paymentcollection_and_more.py b/business/migrations/0009_alter_case_paymentcollection_and_more.py new file mode 100644 index 0000000..fa4a09f --- /dev/null +++ b/business/migrations/0009_alter_case_paymentcollection_and_more.py @@ -0,0 +1,56 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("business", "0008_alter_case_paymentcollection"), + ] + + operations = [ + migrations.AlterField( + model_name="case", + name="paymentcollection", + field=models.CharField(blank=True, default="", max_length=100), + ), + migrations.AlterField( + model_name="casechangerequest", + name="applicant", + field=models.CharField(max_length=100), + ), + migrations.AlterField( + model_name="casechangerequest", + name="approvers_order", + field=models.TextField(blank=True, null=True), + ), + migrations.AlterField( + model_name="casechangerequest", + name="change_agreement", + field=models.TextField(), + ), + migrations.AlterField( + model_name="casechangerequest", + name="change_item", + field=models.TextField(), + ), + migrations.AlterField( + model_name="casechangerequest", + name="change_reason", + field=models.TextField(), + ), + migrations.AlterField( + model_name="casechangerequest", + name="is_deleted", + field=models.BooleanField(default=False), + ), + migrations.AlterField( + model_name="casechangerequest", + name="state", + field=models.CharField(default="审核中", max_length=100), + ), + migrations.AlterField( + model_name="casechangerequest", + name="times", + field=models.CharField(max_length=100), + ), + ] diff --git a/business/models.py b/business/models.py index 1066a79..6cfa9d9 100644 --- a/business/models.py +++ b/business/models.py @@ -58,7 +58,7 @@ class Case(models.Model): ChangeReason = models.TextField(null=True, blank=True) # 变更原因 ChangeAgreement = models.TextField(null=True, blank=True) # 变更协议(URL列表) invoice_status = models.CharField(max_length=100, default='未开票') # 已开票 - paymentcollection = models.CharField(max_length=100) # 已收款 + paymentcollection = models.CharField(max_length=100, default='', blank=True) # 已收款 state = models.CharField(max_length=100) # 状态 approvers_order = models.TextField(null=True, blank=True) # 审核人顺序(JSON格式存储,如:["张三","李四","王五"]) is_deleted = models.BooleanField(default=False) # 软删除标记 diff --git a/business/views.py b/business/views.py index 5011eb8..b0e6eb0 100644 --- a/business/views.py +++ b/business/views.py @@ -1062,7 +1062,7 @@ class caseManagement(APIView): Closingapplication=json.dumps(closing_application_list, ensure_ascii=False), ChangeRequest="", invoice_status=invoice_status or '未开票', - paymentcollection=paymentcollection, + paymentcollection=paymentcollection or "", state="审核中" )