diff --git a/client/src/utils/request.js b/client/src/utils/request.js
index 6a0e35c..f485832 100644
--- a/client/src/utils/request.js
+++ b/client/src/utils/request.js
@@ -7,7 +7,7 @@ import { getToken } from '@/utils/auth'
const service = axios.create({
baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
// withCredentials: true, // send cookies when cross-domain requests
- timeout: 30000 // request timeout
+ timeout: 300000 // request timeout
})
// request interceptor
diff --git a/client/src/views/ability/cma2.vue b/client/src/views/ability/cma2.vue
index b5896f6..42314e6 100644
--- a/client/src/views/ability/cma2.vue
+++ b/client/src/views/ability/cma2.vue
@@ -71,7 +71,7 @@
{{ scope.row.xmmc }}
-
+
{{ scope.row.bzmc }}
@@ -82,6 +82,7 @@
column-key="sszx"
:filters="groupBy.sszx"
:filter-multiple="false"
+ fixed="right"
>
{{ scope.row.sszx }}
diff --git a/server/apps/ability/migrations/0008_auto_20200705_1222.py b/server/apps/ability/migrations/0008_auto_20200705_1222.py
new file mode 100644
index 0000000..a6788f1
--- /dev/null
+++ b/server/apps/ability/migrations/0008_auto_20200705_1222.py
@@ -0,0 +1,53 @@
+# Generated by Django 3.0.5 on 2020-07-05 04:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('ability', '0007_cma_type'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='cma',
+ name='bzbh',
+ field=models.TextField(blank=True, null=True, verbose_name='标准编号'),
+ ),
+ migrations.AlterField(
+ model_name='cma',
+ name='bzmc',
+ field=models.TextField(blank=True, null=True, verbose_name='标准名称'),
+ ),
+ migrations.AlterField(
+ model_name='cma',
+ name='dlmc',
+ field=models.TextField(blank=True, null=True, verbose_name='大类'),
+ ),
+ migrations.AlterField(
+ model_name='cma',
+ name='dlxh',
+ field=models.TextField(blank=True, null=True, verbose_name='大类序号'),
+ ),
+ migrations.AlterField(
+ model_name='cma',
+ name='lbmc',
+ field=models.TextField(blank=True, null=True, verbose_name='类别名称'),
+ ),
+ migrations.AlterField(
+ model_name='cma',
+ name='lbxh',
+ field=models.TextField(blank=True, null=True, verbose_name='类别序号'),
+ ),
+ migrations.AlterField(
+ model_name='cma',
+ name='xmmc',
+ field=models.TextField(blank=True, null=True, verbose_name='项目名称'),
+ ),
+ migrations.AlterField(
+ model_name='cma',
+ name='xmxh',
+ field=models.TextField(blank=True, null=True, verbose_name='项目序号'),
+ ),
+ ]
diff --git a/server/apps/ability/models.py b/server/apps/ability/models.py
index 2939485..8ca19a1 100644
--- a/server/apps/ability/models.py
+++ b/server/apps/ability/models.py
@@ -10,14 +10,14 @@ class CMA(BaseModel):
('center', '总部'),
('sub', '分子公司')
)
- dlxh = models.CharField('大类序号', max_length=200,null=True,blank=True)
- dlmc = models.CharField('大类', max_length=200,null=True,blank=True)
- lbxh = models.CharField('类别序号', max_length=200,null=True,blank=True)
- lbmc = models.CharField('类别名称', max_length=200,null=True,blank=True)
- xmxh = models.CharField('项目序号', max_length=200,null=True,blank=True)
- xmmc = models.CharField('项目名称', max_length=200,null=True,blank=True)
- bzmc = models.CharField('标准名称', max_length=400,null=True,blank=True)
- bzbh = models.CharField('标准编号', max_length=400,null=True,blank=True)
+ dlxh = models.TextField('大类序号', null=True,blank=True)
+ dlmc = models.TextField('大类', null=True,blank=True)
+ lbxh = models.TextField('类别序号', null=True,blank=True)
+ lbmc = models.TextField('类别名称', null=True,blank=True)
+ xmxh = models.TextField('项目序号', null=True,blank=True)
+ xmmc = models.TextField('项目名称', null=True,blank=True)
+ bzmc = models.TextField('标准名称', null=True,blank=True)
+ bzbh = models.TextField('标准编号', null=True,blank=True)
xzfw = models.TextField('限制范围',null=True,blank=True)
bz = models.TextField('备注',null=True,blank=True)
sszx = models.TextField('所属中心',null=True,blank=True)
diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py
index 2df297a..88f855d 100644
--- a/server/apps/ability/views.py
+++ b/server/apps/ability/views.py
@@ -22,7 +22,7 @@ class CMAViewSet(ModelViewSet):
search_fields = ['bzbh', 'bzmc', 'sszx', 'xmmc']
filterset_fields = ['sszx', 'type']
ordering_fields = ['xmxh']
- ordering = 'xmxh'
+ ordering = 'sszx'
@action(methods=['get'], detail=False,url_name='cma_group_by', perms_map = {'*':'*'})
def group(self, request, pk=None):
@@ -53,7 +53,7 @@ class CMAViewSet(ModelViewSet):
os.chdir(fulldir)
rar.extractall()
rar.close()
- CMA.objects.all().delete()
+ CMA.objects.filter(type='center').delete()
for root, dirs, files in os.walk(fulldir):
for f in files:
import_cma(f, os.path.join(root,f))
@@ -74,7 +74,7 @@ class CMAViewSet(ModelViewSet):
os.chdir(fulldir)
rar.extractall()
rar.close()
- CMA.objects.all().delete()
+ CMA.objects.filter(type='sub').delete()
for root, dirs, files in os.walk(fulldir):
for f in files:
import_cma2(f, os.path.join(root,f))
@@ -134,6 +134,7 @@ def import_cma(filename, path):
data['xzfw'] = sheet['i'+str(i)].value
data['bz'] = sheet['j'+str(i)].value
data['sszx'] = sszx
+ data['type'] = 'center'
print(data)
datalist.append(CMA(**data))
i = i + 1
@@ -175,23 +176,92 @@ def import_cnas(filename, path):
CNAS.objects.bulk_create(datalist)
def import_cma2(filename, path):
- wb = load_workbook(path)
+ wb = load_workbook(path,data_only=True)
sheet = wb.worksheets[0]
datalist = []
sszx = filename.split('-')[0]
i = 3
- while sheet['b'+str(i)].value:
+ max_row = sheet.max_row
+ while i