From 51dcf1191b2ddc2662a9f1074216637693d62c36 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 3 Mar 2023 11:02:16 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=96=B0=E6=97=A5?= =?UTF-8?q?=E5=B8=B8=E7=9B=91=E7=9D=A3tr=E5=92=8Cta=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0031_taction_testreport.py | 55 +++++++++++++++++++ server/apps/supervision/models.py | 26 ++++++++- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 server/apps/supervision/migrations/0031_taction_testreport.py diff --git a/server/apps/supervision/migrations/0031_taction_testreport.py b/server/apps/supervision/migrations/0031_taction_testreport.py new file mode 100644 index 0000000..310655a --- /dev/null +++ b/server/apps/supervision/migrations/0031_taction_testreport.py @@ -0,0 +1,55 @@ +# Generated by Django 3.0.5 on 2023-03-03 02:59 + +from django.conf import settings +import django.contrib.postgres.fields.jsonb +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('system', '0022_delete_historicaldict'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('supervision', '0030_auto_20220302_1103'), + ] + + operations = [ + migrations.CreateModel( + name='TestReport', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('accept_number', models.CharField(max_length=20, verbose_name='受理编号')), + ('report_number', models.CharField(blank=True, max_length=20, null=True, verbose_name='报告编号')), + ('description', models.TextField(blank=True, null=True, verbose_name='业务描述')), + ('expect_date', models.DateField(verbose_name='预计发放时间')), + ('issue_date', models.DateField(blank=True, null=True, verbose_name='实际发放时间')), + ('belong_dept', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='testreport_belong_dept', to='system.Organization', verbose_name='所属部门')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='testreport_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='testreport_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='TAction', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('value_old', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict, null=True, verbose_name='原值')), + ('value_new', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict, null=True, verbose_name='新值')), + ('reason_1', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='taction_r1', to='system.Dict', verbose_name='变更主要原因')), + ('reason_2', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='taction_r2', to='system.Dict', verbose_name='变更次要原因')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/server/apps/supervision/models.py b/server/apps/supervision/models.py index cc9f007..e12897e 100644 --- a/server/apps/supervision/models.py +++ b/server/apps/supervision/models.py @@ -1,6 +1,7 @@ from django.db import models from utils.model import BaseModel from apps.system.models import CommonAModel, CommonBModel, Organization, User, Dict, File +from django.contrib.postgres.fields import JSONField # Create your models here. class Content(CommonAModel): @@ -86,4 +87,27 @@ class Record(CommonBModel): class Meta: verbose_name = '报送记录' verbose_name_plural = verbose_name - \ No newline at end of file + + +class TestReport(CommonBModel): + """检测报告 + """ + accept_number = models.CharField('受理编号', max_length=20) + report_number = models.CharField('报告编号', max_length=20, null=True, blank=True) + description = models.TextField('业务描述', null=True, blank=True) + expect_date = models.DateField('预计发放时间') + issue_date = models.DateField('实际发放时间', null=True, blank=True) + + +class TAction(BaseModel): + """检测报告变更记录 + """ + TACTION_TYPE = ( + (10, '正常发放'), + (20, '报告出错'), + (30, '报告迟单') + ) + 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) + value_old = JSONField('原值', null=True, blank=True, default=dict) + value_new = JSONField('新值', null=True, blank=True, default=dict) \ No newline at end of file From 47b3104d720fa648457a0c6001d4e504f47580c7 Mon Sep 17 00:00:00 2001 From: Li xia <2309368887@qq.com> Date: Mon, 6 Mar 2023 16:25:40 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=94=B9=E5=8A=A8node-json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/package.json b/client/package.json index 086cf64..3e43d4a 100644 --- a/client/package.json +++ b/client/package.json @@ -5,7 +5,7 @@ "author": "Pan ", "license": "MIT", "scripts": { - "dev": "vue-cli-service serve", + "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", "build:prod": "vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", @@ -19,7 +19,7 @@ "axios": "0.18.1", "echarts": "^5.4.0", "element-china-area-data": "^5.0.2", - "element-ui": "2.13.0", + "element-ui": "^2.15.13", "file-saver": "^2.0.2", "js-cookie": "2.2.0", "normalize.css": "7.0.0", @@ -49,9 +49,9 @@ "eslint-plugin-vue": "5.2.2", "html-webpack-plugin": "3.2.0", "mockjs": "1.0.1-beta3", - "node-sass": "^6.0.1", "runjs": "^4.3.2", - "sass-loader": "^10.0.1", + "sass": "^1.26.5", + "sass-loader": "^8.0", "script-ext-html-webpack-plugin": "2.1.3", "script-loader": "0.7.2", "serve-static": "^1.13.2", From 818021df6e63d38afefcd27e46e6042ce3b3ba4b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 7 Mar 2023 11:22:50 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E5=85=AC=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/views/ability/cma2.vue | 33 +++++++++++++++++++++++++++++-- server/apps/ability/views.py | 10 +++++++--- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/client/src/views/ability/cma2.vue b/client/src/views/ability/cma2.vue index 4ef2396..9175972 100644 --- a/client/src/views/ability/cma2.vue +++ b/client/src/views/ability/cma2.vue @@ -72,7 +72,8 @@ 导入分子公司能力 - 批量删除 + 批量删除 + 批量删除所属公司 @@ -388,7 +389,35 @@ export default { .catch((err) => { }); }, - + delAll2() { + let sszx = this.listQuery.sszx + if(sszx==null || sszx==='' || sszx == undefined){ + this.$message({ + message: "请选中所属公司", + type: "warning", + }); + return + } + this.$confirm("确认删除?", "警告", { + confirmButtonText: "确认", + cancelButtonText: "取消", + type: "error", + }) + .then(async () => { + + let data = { sszx: sszx }; + deletes(data) + .then((res) => { + this.$message({ + message: "删除成功", + type: "success", + }); + this.getList(); + }) + }) + .catch((err) => { + }); + }, handleSelectionChange(val) { this.multipleSelection = val; }, diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py index 16a02ee..fa1a002 100644 --- a/server/apps/ability/views.py +++ b/server/apps/ability/views.py @@ -186,10 +186,14 @@ class CMAViewSet(RecordMixin, ModelViewSet): @action(methods=['post'], detail=False, url_path='deletes', url_name='cma_deletes', perms_map = {'post':'cma_deletes'}) def deletes(self, request): - array = request.data['ids'] - CMA.objects.filter(pk__in=array).delete() - + array = request.data.get('ids', []) + sszx = request.data.get('sszx', None) + if array: + CMA.objects.filter(sszx__id=sszx).delete() + elif sszx: + CMA.objects.filter(pk__in=array).delete() return Response(status = status.HTTP_200_OK) + @action(methods=['post'], detail=False, url_path='import', url_name='cma_import', perms_map = {'post':'cma_import'}) def cma_import(self, request, pk=None): """ From a6ae4bd004bfb06090873fc36eefdff1c16fccd6 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 7 Mar 2023 13:22:35 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E5=85=AC=E5=8F=B82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/ability/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py index fa1a002..2c2eb60 100644 --- a/server/apps/ability/views.py +++ b/server/apps/ability/views.py @@ -189,9 +189,10 @@ class CMAViewSet(RecordMixin, ModelViewSet): array = request.data.get('ids', []) sszx = request.data.get('sszx', None) if array: - CMA.objects.filter(sszx__id=sszx).delete() - elif sszx: CMA.objects.filter(pk__in=array).delete() + + elif sszx: + CMA.objects.filter(sszx=sszx).delete() return Response(status = status.HTTP_200_OK) @action(methods=['post'], detail=False, url_path='import', url_name='cma_import', perms_map = {'post':'cma_import'}) From 7c565f9bb6884417b3a5ceef129867d76acb866d Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 7 Mar 2023 13:57:16 +0800 Subject: [PATCH 05/12] =?UTF-8?q?Taction=20=E5=A2=9E=E5=8A=A0=20type=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/supervision/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/server/apps/supervision/models.py b/server/apps/supervision/models.py index e12897e..bed9579 100644 --- a/server/apps/supervision/models.py +++ b/server/apps/supervision/models.py @@ -107,6 +107,7 @@ class TAction(BaseModel): (20, '报告出错'), (30, '报告迟单') ) + 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) value_old = JSONField('原值', null=True, blank=True, default=dict) From fd1aa62cb0a2bd1757201ebb5eaa436cf0f2614a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 7 Mar 2023 14:20:20 +0800 Subject: [PATCH 06/12] =?UTF-8?q?TAction=E5=85=B3=E8=81=94=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/package.json | 2 +- .../migrations/0032_taction_type.py | 18 ++++++++++++++++++ .../migrations/0033_taction_testreport.py | 19 +++++++++++++++++++ server/apps/supervision/models.py | 1 + 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 server/apps/supervision/migrations/0032_taction_type.py create mode 100644 server/apps/supervision/migrations/0033_taction_testreport.py 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) From fce452e41e241047f6534bcb179b2902cb7b10b1 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 8 Mar 2023 12:11:26 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=8F=98=E6=9B=B4taction=20model=20?= =?UTF-8?q?=E4=B8=BAcommonamodel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/supervision/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/apps/supervision/models.py b/server/apps/supervision/models.py index 6c00ca3..f7e023e 100644 --- a/server/apps/supervision/models.py +++ b/server/apps/supervision/models.py @@ -99,7 +99,7 @@ class TestReport(CommonBModel): issue_date = models.DateField('实际发放时间', null=True, blank=True) -class TAction(BaseModel): +class TAction(CommonAModel): """检测报告变更记录 """ TACTION_TYPE = ( From 2dfaa6a27387859dd66c74d801711820da367527 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 8 Mar 2023 12:11:52 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=8F=98=E6=9B=B4taction=20model=20?= =?UTF-8?q?=E4=B8=BAcommonamodel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0034_auto_20230308_1204.py | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 server/apps/supervision/migrations/0034_auto_20230308_1204.py diff --git a/server/apps/supervision/migrations/0034_auto_20230308_1204.py b/server/apps/supervision/migrations/0034_auto_20230308_1204.py new file mode 100644 index 0000000..fac7ae9 --- /dev/null +++ b/server/apps/supervision/migrations/0034_auto_20230308_1204.py @@ -0,0 +1,26 @@ +# Generated by Django 3.0.5 on 2023-03-08 04:04 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('supervision', '0033_taction_testreport'), + ] + + operations = [ + migrations.AddField( + model_name='taction', + name='create_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='taction_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'), + ), + migrations.AddField( + model_name='taction', + name='update_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='taction_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'), + ), + ] From fae6fbde88b6ff35cfff4f5324c41bfa9b8d5a6c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 7 Apr 2023 10:40:36 +0800 Subject: [PATCH 09/12] =?UTF-8?q?fix:=20=E5=AF=BC=E5=85=A5=E6=97=B6?= =?UTF-8?q?=E4=BD=BF=E7=94=A8get('')=E7=BB=93=E6=9E=84=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E5=85=88=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/.env.development | 4 ++-- server/apps/ability/views.py | 16 ++++++++++++++-- .../570eef2524c1a8e683521a9e16a59039.djcache | Bin 48 -> 48 bytes 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/client/.env.development b/client/.env.development index 487e749..f6c64bf 100644 --- a/client/.env.development +++ b/client/.env.development @@ -3,8 +3,8 @@ ENV = 'development' # base api #VUE_APP_BASE_API = 'http://10.0.11.127:8000/api' -#VUE_APP_BASE_API = 'http://127.0.0.1:2222/api' -VUE_APP_BASE_API = 'https://testsearch.ctc.ac.cn/api' +VUE_APP_BASE_API = 'http://127.0.0.1:2222/api' +# VUE_APP_BASE_API = 'https://testsearch.ctc.ac.cn/api' #VUE_APP_BASE_API = 'http://47.95.0.242:9101/api' diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py index 2c2eb60..8930ce1 100644 --- a/server/apps/ability/views.py +++ b/server/apps/ability/views.py @@ -219,6 +219,9 @@ class CMAViewSet(RecordMixin, ModelViewSet): return Response('不支持非xlsx格式', status = status.HTTP_400_BAD_REQUEST) elif fullpath.endswith('.zip'): fulldir = fullpath.replace('.zip','') + if os.path.exists(fulldir): + import shutil + shutil.rmtree(fulldir) # 先删除该文件夹 os.mkdir(fulldir) os.chdir(fulldir) CMA.objects.filter(type='center').delete() @@ -255,6 +258,9 @@ class CMAViewSet(RecordMixin, ModelViewSet): return Response('不支持非xlsx格式', status = status.HTTP_400_BAD_REQUEST) elif fullpath.endswith('.zip'): fulldir = fullpath.replace('.zip','') + if os.path.exists(fulldir): + import shutil + shutil.rmtree(fulldir) # 先删除该文件夹 os.mkdir(fulldir) os.chdir(fulldir) # CMA.objects.filter(type='sub').delete() @@ -416,6 +422,9 @@ class InspectionViewSet(RecordMixin, ModelViewSet): return Response('不支持非xlsx格式', status = status.HTTP_400_BAD_REQUEST) elif fullpath.endswith('.zip'): fulldir = fullpath.replace('.zip','') + if os.path.exists(fulldir): + import shutil + shutil.rmtree(fulldir) # 先删除该文件夹 os.mkdir(fulldir) os.chdir(fulldir) # CMA.objects.filter(type='sub').delete() @@ -481,6 +490,9 @@ class CNASViewSet(RecordMixin, ModelViewSet): import_cnas(f, os.path.join(root,f)) elif fullpath.endswith('.zip'): fulldir = fullpath.replace('.zip','') + if os.path.exists(fulldir): + import shutil + shutil.rmtree(fulldir) # 先删除该文件夹 os.mkdir(fulldir) os.chdir(fulldir) CNAS.objects.all().delete() @@ -651,7 +663,7 @@ def import_cma2(filename, path): data['lbxh'] = sheet['c'+str(i)].value defaultv['lbxh'] = data['lbxh'] else: - data['lbxh'] = defaultv['lbxh'] + data['lbxh'] = defaultv.get('lbxh', '') if sheet['d'+str(i)].value: data['lbmc'] = sheet['d'+str(i)].value defaultv['lbmc'] = data['lbmc'] @@ -661,7 +673,7 @@ def import_cma2(filename, path): data['xmxh'] = sheet['e'+str(i)].value defaultv['xmxh'] = data['xmxh'] else: - data['xmxh'] = defaultv.get('xmxh', None) + data['xmxh'] = defaultv.get('xmxh', '') if sheet['f'+str(i)].value: data['xmmc'] = sheet['f'+str(i)].value defaultv['xmmc'] = data['xmmc'] diff --git a/server/temp/570eef2524c1a8e683521a9e16a59039.djcache b/server/temp/570eef2524c1a8e683521a9e16a59039.djcache index f2514f02da48222f899c89b56ace77fb96726813..2edda4ff532f0a4ccbd50ee9b8928cbf88d149be 100644 GIT binary patch literal 48 zcmZo*oyx@k0q%}B8P^>P{;^!IVor9#+*5}c7&iu2MF Date: Fri, 7 Apr 2023 10:43:43 +0800 Subject: [PATCH 10/12] =?UTF-8?q?fix:=20gitignore=20=E8=BF=BD=E8=B8=AA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../temp/570eef2524c1a8e683521a9e16a59039.djcache | Bin 48 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 server/temp/570eef2524c1a8e683521a9e16a59039.djcache diff --git a/server/temp/570eef2524c1a8e683521a9e16a59039.djcache b/server/temp/570eef2524c1a8e683521a9e16a59039.djcache deleted file mode 100644 index 2edda4ff532f0a4ccbd50ee9b8928cbf88d149be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmZo*oyx@k0q%}B8P^>P{;^!IVor9#+*5}c7&iu2MF Date: Fri, 7 Apr 2023 12:13:42 +0800 Subject: [PATCH 11/12] =?UTF-8?q?fix:=20import=5Fcma2=E4=B8=8D=E4=BA=8B?= =?UTF-8?q?=E5=85=88=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/ability/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py index 8930ce1..80615ec 100644 --- a/server/apps/ability/views.py +++ b/server/apps/ability/views.py @@ -642,8 +642,8 @@ def import_cma2(filename, path): sheet = wb.worksheets[0] datalist = [] sszx = filename.split('-')[0] - if CMA.objects.filter(sszx=sszx, type='sub').exists(): - CMA.objects.filter(sszx=sszx, type='sub').delete() + # if CMA.objects.filter(sszx=sszx, type='sub').exists(): + # CMA.objects.filter(sszx=sszx, type='sub').delete() i = 3 max_row = sheet.max_row defaultv = {} From a50d97cf98599b7e893d280628bd398e0a2bd85a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 7 Apr 2023 16:42:41 +0800 Subject: [PATCH 12/12] =?UTF-8?q?fix:=20provinceLists=20data=20=E5=BF=98?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/api/ability.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/api/ability.js b/client/src/api/ability.js index d7b9218..00e3f12 100644 --- a/client/src/api/ability.js +++ b/client/src/api/ability.js @@ -270,10 +270,11 @@ export function qactionDelete(id) { -export function provinceLists() { +export function provinceLists(data) { return request({ url:`/system/province/`, method:'get', + params:data }) } export function cityLists(query) {