diff --git a/client/src/views/supervisionNew/mytask.vue b/client/src/views/supervisionNew/mytask.vue index 76def47..0fe4221 100644 --- a/client/src/views/supervisionNew/mytask.vue +++ b/client/src/views/supervisionNew/mytask.vue @@ -121,7 +121,7 @@ - +
@@ -263,7 +263,12 @@ - + + + + - + + { let data = res.data.results; that.subData = []; - data.forEach(item => { + data.forEach(item => { let obj = item; let goal_value_a = item.goal_value_a+''; if(item.goal_name=='重大质量事故'){ @@ -1218,6 +1224,7 @@ this.$refs.saveComDialog.open("add",this.task2do); }); }else if(type=='oinspect'){ + console.log('x') this.dialogOin = true; this.$nextTick(() => { this.$refs.saveOinDialog.open("add",this.task2do); diff --git a/client/src/views/supervisionNew/oinspect_form.vue b/client/src/views/supervisionNew/oinspect_form.vue index 6b7dc40..ab3021b 100644 --- a/client/src/views/supervisionNew/oinspect_form.vue +++ b/client/src/views/supervisionNew/oinspect_form.vue @@ -1,7 +1,7 @@ diff --git a/client/src/views/supervisionNew/taskdo.vue b/client/src/views/supervisionNew/taskdo.vue index 02005de..754f1ab 100644 --- a/client/src/views/supervisionNew/taskdo.vue +++ b/client/src/views/supervisionNew/taskdo.vue @@ -426,7 +426,8 @@ - + + @@ -922,7 +923,6 @@ export default { '检查日期': '', '检查结果': '', '检查日期': '', - '文件路径': '', '单位名称': '', }]; if (oinspectList.length > 0) { @@ -935,7 +935,6 @@ export default { '检查日期': item6.date_inspect, '检查结果': item6.result, '结果日期': item6.result_date, - '文件路径': item6.file_path, '单位名称': item6.belong_dept_name, }; }); diff --git a/server/apps/information/migrations/0002_auto_20240326_0932.py b/server/apps/information/migrations/0002_auto_20240326_0932.py new file mode 100644 index 0000000..c5c6b58 --- /dev/null +++ b/server/apps/information/migrations/0002_auto_20240326_0932.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.12 on 2024-03-26 01:32 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('information', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='abilityreview', + name='judging_method', + field=models.PositiveSmallIntegerField(choices=[(0, '文审'), (10, '现场')], max_length=20, verbose_name='评审方法'), + ), + migrations.AlterField( + model_name='abilityreview', + name='judging_type', + field=models.PositiveSmallIntegerField(choices=[(0, '初次'), (10, '扩项'), (20, '变更'), (30, '复评'), (40, '迁址')], max_length=20, verbose_name='评审类型'), + ), + ] diff --git a/server/apps/information/models.py b/server/apps/information/models.py index 4b00d12..0fdd528 100644 --- a/server/apps/information/models.py +++ b/server/apps/information/models.py @@ -4,18 +4,18 @@ from django.db import models class AbilityReview(models.Model): type_method = ( - ('文审', '文审'), - ('现场', '现场')) + (0, '文审'), + (10, '现场')) - juge_type = ( ('初次', '初次'), - ('扩项', '扩项'), - ('变更', '变更'), - ('复评', '复评'), - ('迁址', '迁址')) + juge_type = ( (0, '初次'), + (10, '扩项'), + (20, '变更'), + (30, '复评'), + (40, '迁址')) name = models.CharField(max_length=20, unique=True, verbose_name='公司名称') qualification_name = models.CharField(max_length=20, verbose_name='资质名称') - judging_method = models.CharField(max_length=20, choices=type_method, verbose_name='评审方法') - judging_type = models.CharField(max_length=20, choices=juge_type, verbose_name='评审类型') + judging_method = models.PositiveSmallIntegerField(max_length=20, choices=type_method, verbose_name='评审方法') + judging_type = models.PositiveSmallIntegerField(max_length=20, choices=juge_type, verbose_name='评审类型') add_param = models.IntegerField(default=0, verbose_name='新增参数') review_date = models.DateField(verbose_name='评审日期', null=True) now_count = models.IntegerField(default=0, verbose_name='现有场所数量') diff --git a/server/apps/supervision/migrations/0064_auto_20240326_1004.py b/server/apps/supervision/migrations/0064_auto_20240326_1004.py new file mode 100644 index 0000000..9e3ae5f --- /dev/null +++ b/server/apps/supervision/migrations/0064_auto_20240326_1004.py @@ -0,0 +1,34 @@ +# Generated by Django 3.2.12 on 2024-03-26 02:04 + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('supervision', '0063_alter_oinspect_result_date'), + ] + + operations = [ + migrations.RemoveField( + model_name='oinspect', + name='file_path', + ), + migrations.AddField( + model_name='oinspect', + name='notification_form', + field=models.CharField(max_length=100, null=True, verbose_name='检查通知单'), + ), + migrations.AddField( + model_name='oinspect', + name='result_form', + field=models.CharField(max_length=100, null=True, verbose_name='检查结果告知单'), + ), + migrations.AlterField( + model_name='oinspect', + name='result_date', + field=models.DateField(default=datetime.datetime(2024, 3, 26, 2, 4, 32, 900039, tzinfo=utc), verbose_name='检查结果日期'), + ), + ] diff --git a/server/apps/supervision/models.py b/server/apps/supervision/models.py index 2196ebe..524f085 100644 --- a/server/apps/supervision/models.py +++ b/server/apps/supervision/models.py @@ -294,5 +294,6 @@ class Oinspect(CommonBDModel): date_inspect = models.DateField('检查日期') result = models.TextField('检查结果') result_date = models.DateField('检查结果日期', default=timezone.now()) - file_path = models.CharField('附件路径', max_length=100) + notification_form = models.CharField('检查通知单', max_length=100, null=True) + result_form = models.CharField('检查结果告知单', max_length=100, null=True) task2do = models.ForeignKey('supervision.task2do', verbose_name= '关联任务执行', on_delete=models.SET_NULL, null=True, blank=True) \ No newline at end of file