diff --git a/client/src/views/informatiomCollect/externalAuditor.vue b/client/src/views/informatiomCollect/externalAuditor.vue
index d8277fb..a32415a 100644
--- a/client/src/views/informatiomCollect/externalAuditor.vue
+++ b/client/src/views/informatiomCollect/externalAuditor.vue
@@ -13,7 +13,9 @@
-
+
+
diff --git a/client/src/views/informatiomCollect/qualityActive.vue b/client/src/views/informatiomCollect/qualityActive.vue
index 6d81ea5..9811a63 100644
--- a/client/src/views/informatiomCollect/qualityActive.vue
+++ b/client/src/views/informatiomCollect/qualityActive.vue
@@ -11,6 +11,7 @@
border fit stripe
highlight-current-row>
+
@@ -51,6 +52,9 @@
+
+
+
@@ -200,6 +204,7 @@ import XLSX from 'xlsx';
const defaultContent = {
name: "",
+ company: "",
roles: "",
collaborators: "",
orgunits: "",
@@ -218,6 +223,7 @@ export default {
return {
form: {
name: "",
+ company: "",
roles: "",
collaborators: "",
orgunits: "",
diff --git a/client/src/views/informatiomCollect/qualityCommend.vue b/client/src/views/informatiomCollect/qualityCommend.vue
index 2f8e27d..aeb7691 100644
--- a/client/src/views/informatiomCollect/qualityCommend.vue
+++ b/client/src/views/informatiomCollect/qualityCommend.vue
@@ -9,6 +9,9 @@
+
+ {{ scope.row.company }}
+
{{ scope.row.name }}
@@ -51,6 +54,9 @@
+
+
+
@@ -171,6 +177,7 @@ import { upUrl, upHeaders } from "@/api/file";
import { saveAs } from 'file-saver';
import XLSX from 'xlsx';
const defaultContent = {
+ company:"",
name: "",
commendation_name: "",
Awards_level: "",
@@ -185,6 +192,7 @@ export default {
data(){
return {
form: {
+ company:"",
name: "",
commendation_name: "",
Awards_level: "",
diff --git a/server/apps/exam/views.py b/server/apps/exam/views.py
index 5bd4df3..ec234c6 100644
--- a/server/apps/exam/views.py
+++ b/server/apps/exam/views.py
@@ -59,7 +59,6 @@ def dectry(p):
def acquire_lock(lock_name, timeout=60):
identifier = str(uuid.uuid4())
lock = cache.add(lock_name, identifier, timeout=timeout)
- print(lock, identifier)
return identifier if lock else None
def release_lock(lock_name, identifier):
diff --git a/server/apps/information/migrations/0065_auto_20251216_1620.py b/server/apps/information/migrations/0065_auto_20251216_1620.py
new file mode 100644
index 0000000..02d79e4
--- /dev/null
+++ b/server/apps/information/migrations/0065_auto_20251216_1620.py
@@ -0,0 +1,30 @@
+# Generated by Django 3.2.12 on 2025-12-16 08:20
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('information', '0064_auto_20240712_1523'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='qualityactivities',
+ name='company',
+ field=models.CharField(blank=True, max_length=50, null=True, verbose_name='公司名称'),
+ ),
+ migrations.AddField(
+ model_name='qualitycommendation',
+ name='company',
+ field=models.CharField(blank=True, max_length=50, null=True, verbose_name='公司名称'),
+ ),
+ migrations.AlterField(
+ model_name='qualification',
+ name='change_date',
+ field=models.DateField(blank=True, default=datetime.datetime(2025, 12, 16, 8, 20, 22, 120810, tzinfo=utc), null=True, verbose_name='变更日期'),
+ ),
+ ]
diff --git a/server/apps/information/models.py b/server/apps/information/models.py
index 58354fc..4b6e092 100644
--- a/server/apps/information/models.py
+++ b/server/apps/information/models.py
@@ -70,6 +70,7 @@ class AbilityReview(CommonBDModel):
class QualityCommendation(CommonBDModel):
+ company = models.CharField(max_length=50, verbose_name='公司名称', null=True, blank=True)
name = models.CharField(max_length=50, verbose_name='项目名称')
commendation_name = models.CharField(max_length=50, verbose_name='表彰名称')
Awards_level = models.CharField(max_length=50, verbose_name='获奖等级')
@@ -85,6 +86,7 @@ class QualityCommendation(CommonBDModel):
class QualityActivities(CommonBDModel):
role = ((0,'组织方'),(1,'参与方'))
+ company = models.CharField(max_length=50, verbose_name='公司名称', null=True, blank=True)
name = models.CharField(max_length=20, verbose_name='活动名称')
roles = models.PositiveSmallIntegerField(max_length=20, choices=role, verbose_name='参与角色')
collaborators = models.CharField(max_length=20, verbose_name='合作方')