+
文档
视频
@@ -27,7 +27,7 @@
@@ -288,6 +288,7 @@ export default {
})
},
handleCreate(val) {
+ console.log(val)
this.material = Object.assign({}, defaultmaterial)
this.material.type = val
this.fileList = []
diff --git a/test_client/src/views/youpei/index.vue b/test_client/src/views/youpei/index.vue
index 5c3ac04..7cdc5a5 100644
--- a/test_client/src/views/youpei/index.vue
+++ b/test_client/src/views/youpei/index.vue
@@ -27,6 +27,12 @@
{{ scope.row.co_sponsor_points }}
+
+ ![]()
+
{{ scope.row.edu_points+scope.row.co_sponsor_points }}
@@ -56,9 +62,8 @@
:model="companydata"
label-width="120px"
label-position="right"
- :rules="rule1"
>
-
+
@@ -67,6 +72,23 @@
+
+
+ ![]()
+ 点击上传
+
+
+
+
取消
@@ -129,7 +151,6 @@
:model="childCompy"
label-width="120px"
label-position="right"
- :rules="rule1"
>
{
+ updateCompany(this.companydata.id, this.companydata).then(() => {
this.getList()
+ // 清空上传图片
this.dialogVisible = false
this.$message.success('成功')
})
diff --git a/test_server/cms/migrations/0019_auto_20250304_1552.py b/test_server/cms/migrations/0019_auto_20250304_1552.py
new file mode 100644
index 0000000..b2e9e20
--- /dev/null
+++ b/test_server/cms/migrations/0019_auto_20250304_1552.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.12 on 2025-03-04 07:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('cms', '0018_auto_20240918_1109'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='companyinfo',
+ name='photo',
+ field=models.CharField(blank=True, max_length=100, null=True, verbose_name='公司图片'),
+ ),
+ migrations.AddField(
+ model_name='companyinfo',
+ name='remark',
+ field=models.TextField(blank=True, max_length=500, null=True, verbose_name='备注'),
+ ),
+ ]
diff --git a/test_server/cms/models.py b/test_server/cms/models.py
index 770a97f..867cc69 100644
--- a/test_server/cms/models.py
+++ b/test_server/cms/models.py
@@ -69,7 +69,7 @@ class CompanyInfo(CommonModel):
edu_points = models.FloatField('教育积分', null=True, blank=True)
co_sponsor_points = models.FloatField('协办大赛积分', null=True, blank=True)
sum_points = models.FloatField('总积分', null=True, blank=True)
- photo = models.ImageField('公司图片', upload_to='photo', null=True, blank=True)
+ photo = models.CharField('公司图片', null=True, blank=True, max_length=100)
remark = models.TextField('备注', null=True, blank=True, max_length=500)
def __str__(self):
diff --git a/test_server/cms/serializers.py b/test_server/cms/serializers.py
index b59a8b2..1680800 100644
--- a/test_server/cms/serializers.py
+++ b/test_server/cms/serializers.py
@@ -88,24 +88,3 @@ class ChildrenCompanySerializer(serializers.ModelSerializer):
parent_company.sum_points = parent_company.edu_points + parent_company.co_sponsor_points
parent_company.save()
return instance
-
-
-# # # 定义信号处理器
-# from django.db.models.signals import pre_save
-# from django.dispatch import receiver
-# from .models import ChildrenCompany, CompanyInfo
-
-
-# @receiver(pre_save, sender=ChildrenCompany)
-# def update_parent_sum_points(sender, instance, **kwargs):
-# parent_company = instance.parent_company
-# child_companies = ChildrenCompany.objects.filter(parent_company=parent_company)
-# # 计算子公司的积分
-# child_edu_sum = sum(c.child_edu_points or 0 for c in child_companies)
-# child_co_sponsor_sum = sum(c.child_co_sponsor_points or 0 for c in child_companies)
-
-# # 更新父公司的总积分
-# parent_company.edu_points = child_edu_sum
-# parent_company.co_sponsor_points = child_co_sponsor_sum
-# parent_company.sum_points = child_edu_sum + child_co_sponsor_sum
-# parent_company.save()
\ No newline at end of file
diff --git a/test_server/cms/views.py b/test_server/cms/views.py
index 6f215bb..bad82e6 100644
--- a/test_server/cms/views.py
+++ b/test_server/cms/views.py
@@ -78,6 +78,7 @@ class ChildrenCompanyViewSet(ModelViewSet):
ordering_fields = ['update_time']
ordering = ['-update_time']
+
class MaterialViewSet(ModelViewSet):
"""
资料：增删改查
diff --git a/test_server/crm/migrations/0048_auto_20250304_1410.py b/test_server/crm/migrations/0048_auto_20250304_1410.py
new file mode 100644
index 0000000..b6eafd6
--- /dev/null
+++ b/test_server/crm/migrations/0048_auto_20250304_1410.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.2.12 on 2025-03-04 06:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('crm', '0047_auto_20240919_1605'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='candidate',
+ options={'ordering': ['opllevel'], 'verbose_name': '证书', 'verbose_name_plural': '证书'},
+ ),
+ migrations.AlterField(
+ model_name='candidate',
+ name='opllevel',
+ field=models.IntegerField(blank=True, choices=[(0, '高级工'), (1, '中级工'), (2, '初级工'), (3, '高级技师'), (4, '技师')], null=True),
+ ),
+ ]
diff --git a/test_server/crm/models.py b/test_server/crm/models.py
index 643245b..8f6e3b0 100644
--- a/test_server/crm/models.py
+++ b/test_server/crm/models.py
@@ -107,6 +107,13 @@ class SendCode(CommonModel):
code = models.CharField(max_length=6, verbose_name= '验证码')
class Candidate(CommonModel):
+ OP_LEVEL_CHOICES = [
+ (0, '高级工'),
+ (1, '中级工'),
+ (2, '初级工'),
+ (3, '高级技师'),
+ (4, '技师'),
+ ]
consumer = models.ForeignKey(Consumer, on_delete=models.SET_NULL, related_name='candidate_consumer', null=True, blank=True)
workscope = models.ForeignKey(WorkScope, on_delete=models.SET_NULL, related_name='candidate_workscope', null=True, blank=True)
examtest = models.OneToOneField(to='examtest.examtest', verbose_name='关联考试', null=True, blank=True, on_delete=models.SET_NULL)
@@ -130,11 +137,12 @@ class Candidate(CommonModel):
train_end_date = models.DateField('培训结束日期', null=True)
create_admin = models.ForeignKey(UserProfile, verbose_name="创建管理员", null=True, blank=True, on_delete=models.SET_NULL)
gender = models.CharField('性别', max_length=10, null=True, blank=True)
- opllevel = models.CharField('职业等级',max_length=60, null=True, blank=True)
+ opllevel = models.IntegerField(choices=OP_LEVEL_CHOICES, null=True, blank=True, default=0)
class Meta:
verbose_name = '证书'
verbose_name_plural = verbose_name
+ ordering = ['opllevel']
def __str__(self):
return self.consumer.username
diff --git a/test_server/crm/views.py b/test_server/crm/views.py
index 51c3b8d..b6b60d9 100644
--- a/test_server/crm/views.py
+++ b/test_server/crm/views.py
@@ -743,8 +743,7 @@ class CandidateViewSet(RetrieveModelMixin, ListModelMixin, CreateModelMixin, Upd
filter_backends = [DjangoFilterBackend,SearchFilter, OrderingFilter]
filterset_fields = ['consumer', 'create_admin']
search_fields = ('number', 'consumer_name', 'workscope_name', 'company_name', 'create_admin__username', 'ID_number')
- ordering_fields = ('-id', 'update_time')
- ordering = ['-update_time']
+ ordering_fields = ('-id', 'update_time', 'opllevel')
def get_serializer_class(self):
if self.action in ['create', 'update']:
diff --git a/test_server/examtest/services.py b/test_server/examtest/services.py
index 1656840..bb0b99a 100644
--- a/test_server/examtest/services.py
+++ b/test_server/examtest/services.py
@@ -5,7 +5,7 @@ from datetime import timedelta
from rest_framework.exceptions import ParseError
from rbac.models import UserProfile
from PIL import Image, ImageDraw, ImageFont
-import settings, datetime
+import datetime
from server import settings
def issue(obj: ExamTest, create_admin: UserProfile = None):