diff --git a/client/src/api/device.js b/client/src/api/device.js
new file mode 100644
index 0000000..fef8206
--- /dev/null
+++ b/client/src/api/device.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+
+export function getDeviceList(query) {
+ return request({
+ url: '/consulting/device/',
+ method: 'get',
+ params: query
+ })
+ }
+
+
+export function DeviceImp(data) {
+ return request({
+ url: '/consulting/device/imp/',
+ method: 'post',
+ data
+ })
+}
\ No newline at end of file
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 0327d44..6f8ef3f 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -203,7 +203,12 @@ export const asyncRoutes = [
name: 'professional',
component: () => import('@/views/consulting/professional.vue'),
meta: { title: '专业领域要求', perms: ['professional_view'] }
- }, {
+ },{
+ path: 'device',
+ name: 'device',
+ component: () => import('@/views/consulting/device.vue'),
+ meta: { title: '设备台账', perms: ['policy_view'] }
+ }, {
path: 'validation',
name: 'validation',
component: () => import('@/views/consulting/validation.vue'),
diff --git a/client/src/views/consulting/device.vue b/client/src/views/consulting/device.vue
new file mode 100644
index 0000000..676be35
--- /dev/null
+++ b/client/src/views/consulting/device.vue
@@ -0,0 +1,243 @@
+
+
+
+
+ 搜索
+ 导入Excel
+
+
+
+
+
+ {{ scope.row.company_name }}
+
+
+ {{ scope.row.device_name }}
+
+
+ {{ scope.row.device_number }}
+
+
+ {{ scope.row.spec }}
+
+
+ {{ scope.row.manufactor }}
+
+
+ {{ scope.row.dec_parameter }}
+
+
+ {{ scope.row.range }}
+
+
+ {{ scope.row.precision }}
+
+
+ {{ scope.row.other_parameter }}
+
+
+ {{ scope.row.department }}
+
+
+ {{ scope.row.procurement_time }}
+
+
+ {{ scope.row.original_price }}
+
+
+ {{ scope.row.current_price }}
+
+
+
+ 是
+ 否
+
+
+
+ {{ scope.row.infras_percentage }}
+
+
+
+ 是
+ 否
+
+
+
+ {{ scope.row.custodian }}
+
+
+ {{ scope.row.depositor }}
+
+
+ {{ scope.row.contacts }}
+
+
+ {{ scope.row.tel }}
+
+
+ {{ scope.row.remark }}
+
+
+
+
+
+
+
+
+
+ 上传文件
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+
diff --git a/client/src/views/supervisionNew/pt_form.vue b/client/src/views/supervisionNew/pt_form.vue
index ea7d35a..dceef5e 100644
--- a/client/src/views/supervisionNew/pt_form.vue
+++ b/client/src/views/supervisionNew/pt_form.vue
@@ -115,8 +115,11 @@ import { options } from "runjs";
params: "",
result: 10,
handle_result:0,
+ field:"",
+ a_class:true,
task2do: 0
},
+ type: "add",
titleOption: {
add: "新增能力验证结果",
edit: "能力验证结果编辑",
diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py
index 48cb4fc..293ad7e 100644
--- a/server/apps/supervision/views.py
+++ b/server/apps/supervision/views.py
@@ -704,7 +704,7 @@ class ImpMixin:
# 对于能力验证和监督检查进行有则跳过无则更新操作。
if repalce:
if types.lower()== 'pt':
- model_info = mymodel.objects.filter(name=data.get('name'), number=data.get('number'))
+ model_info = mymodel.objects.filter(name=data.get('name'), number=data.get('number'), params=data.get('params'))
if model_info:
i = i + 1
continue