diff --git a/client/package.json b/client/package.json index 3e43d4a..5617562 100644 --- a/client/package.json +++ b/client/package.json @@ -6,7 +6,7 @@ "license": "MIT", "scripts": { "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", - "build:prod": "vue-cli-service build", + "build:prod": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src", diff --git a/server/apps/supervision/migrations/0032_taction_type.py b/server/apps/supervision/migrations/0032_taction_type.py new file mode 100644 index 0000000..b706c2d --- /dev/null +++ b/server/apps/supervision/migrations/0032_taction_type.py @@ -0,0 +1,18 @@ +# Generated by Django 3.0.5 on 2023-03-07 05:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('supervision', '0031_taction_testreport'), + ] + + operations = [ + migrations.AddField( + model_name='taction', + name='type', + field=models.PositiveSmallIntegerField(default=10, verbose_name='变更类型'), + ), + ] diff --git a/server/apps/supervision/migrations/0033_taction_testreport.py b/server/apps/supervision/migrations/0033_taction_testreport.py new file mode 100644 index 0000000..381c0bd --- /dev/null +++ b/server/apps/supervision/migrations/0033_taction_testreport.py @@ -0,0 +1,19 @@ +# Generated by Django 3.0.5 on 2023-03-07 06:19 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('supervision', '0032_taction_type'), + ] + + operations = [ + migrations.AddField( + model_name='taction', + name='testreport', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='supervision.TestReport', verbose_name='关联检测报告'), + ), + ] diff --git a/server/apps/supervision/models.py b/server/apps/supervision/models.py index bed9579..6c00ca3 100644 --- a/server/apps/supervision/models.py +++ b/server/apps/supervision/models.py @@ -107,6 +107,7 @@ class TAction(BaseModel): (20, '报告出错'), (30, '报告迟单') ) + testreport = models.ForeignKey(TestReport, on_delete=models.CASCADE, verbose_name='关联检测报告', null=True, blank=True) type = models.PositiveSmallIntegerField('变更类型', default=10) reason_1 = models.ForeignKey(Dict, verbose_name='变更主要原因', related_name='taction_r1', on_delete= models.SET_NULL, null=True, blank=True) reason_2 = models.ForeignKey(Dict, verbose_name='变更次要原因', related_name='taction_r2', on_delete= models.SET_NULL, null=True, blank=True)