diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 3e3ccb0..f29d997 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -69,3 +69,20 @@
responseType: 'blob',
})
}
+
+// 文件审批列表(分页)
+export function approvallistPageApi(data: any) {
+ return request({
+ url: `/meter/file/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+// 审批详情
+export function approvallistPageDetailApi(data: object) {
+ return request({
+ url: '/meter/file/approval/listPage',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 3e3ccb0..f29d997 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -69,3 +69,20 @@
responseType: 'blob',
})
}
+
+// 文件审批列表(分页)
+export function approvallistPageApi(data: any) {
+ return request({
+ url: `/meter/file/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+// 审批详情
+export function approvallistPageDetailApi(data: object) {
+ return request({
+ url: '/meter/file/approval/listPage',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index b0841fd..9a30ce3 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -35,4 +35,11 @@
data,
})
}
-
+// 获取标准装置列表
+export function standardlistPageApi(data: any) {
+ return request({
+ url: `/meter/standard/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 3e3ccb0..f29d997 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -69,3 +69,20 @@
responseType: 'blob',
})
}
+
+// 文件审批列表(分页)
+export function approvallistPageApi(data: any) {
+ return request({
+ url: `/meter/file/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+// 审批详情
+export function approvallistPageDetailApi(data: object) {
+ return request({
+ url: '/meter/file/approval/listPage',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index b0841fd..9a30ce3 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -35,4 +35,11 @@
data,
})
}
-
+// 获取标准装置列表
+export function standardlistPageApi(data: any) {
+ return request({
+ url: `/meter/standard/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
new file mode 100644
index 0000000..1678cdb
--- /dev/null
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 3e3ccb0..f29d997 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -69,3 +69,20 @@
responseType: 'blob',
})
}
+
+// 文件审批列表(分页)
+export function approvallistPageApi(data: any) {
+ return request({
+ url: `/meter/file/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+// 审批详情
+export function approvallistPageDetailApi(data: object) {
+ return request({
+ url: '/meter/file/approval/listPage',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index b0841fd..9a30ce3 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -35,4 +35,11 @@
data,
})
}
-
+// 获取标准装置列表
+export function standardlistPageApi(data: any) {
+ return request({
+ url: `/meter/standard/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
new file mode 100644
index 0000000..1678cdb
--- /dev/null
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 05d9034..c2682fc 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -1,23 +1,34 @@
-
-
-
@@ -328,7 +348,7 @@
-
+
@@ -340,33 +360,33 @@
-
+
-
+
-
+
-
+
-
+
@@ -375,26 +395,26 @@
-
+
-
+
-
+
-
+
扫描
@@ -409,7 +429,7 @@
@@ -418,22 +438,22 @@
-
+
-
-
+
+
@@ -441,12 +461,12 @@
-
+
-
+
@@ -458,21 +478,21 @@
v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
:tree-props="deptProps"
/>
-
+
-
+
-
+
@@ -481,8 +501,13 @@
-
-
+
+
+
@@ -490,7 +515,7 @@
@@ -499,14 +524,14 @@
-
+
@@ -515,21 +540,21 @@
-
+
-
+
-
+
@@ -539,24 +564,24 @@
-
+
-
+
-
+
-
+
@@ -565,78 +590,77 @@
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -646,19 +670,6 @@
-
-
-
@@ -671,10 +682,11 @@
-
+
{{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+ 暂无
@@ -685,22 +697,8 @@
-
-
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 3e3ccb0..f29d997 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -69,3 +69,20 @@
responseType: 'blob',
})
}
+
+// 文件审批列表(分页)
+export function approvallistPageApi(data: any) {
+ return request({
+ url: `/meter/file/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+// 审批详情
+export function approvallistPageDetailApi(data: object) {
+ return request({
+ url: '/meter/file/approval/listPage',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index b0841fd..9a30ce3 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -35,4 +35,11 @@
data,
})
}
-
+// 获取标准装置列表
+export function standardlistPageApi(data: any) {
+ return request({
+ url: `/meter/standard/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
new file mode 100644
index 0000000..1678cdb
--- /dev/null
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 05d9034..c2682fc 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -1,23 +1,34 @@
-
-
-
@@ -328,7 +348,7 @@
-
+
@@ -340,33 +360,33 @@
-
+
-
+
-
+
-
+
-
+
@@ -375,26 +395,26 @@
-
+
-
+
-
+
-
+
扫描
@@ -409,7 +429,7 @@
@@ -418,22 +438,22 @@
-
+
-
-
+
+
@@ -441,12 +461,12 @@
-
+
-
+
@@ -458,21 +478,21 @@
v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
:tree-props="deptProps"
/>
-
+
-
+
-
+
@@ -481,8 +501,13 @@
-
-
+
+
+
@@ -490,7 +515,7 @@
@@ -499,14 +524,14 @@
-
+
@@ -515,21 +540,21 @@
-
+
-
+
-
+
@@ -539,24 +564,24 @@
-
+
-
+
-
+
-
+
@@ -565,78 +590,77 @@
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -646,19 +670,6 @@
-
-
-
@@ -671,10 +682,11 @@
-
+
{{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+ 暂无
@@ -685,22 +697,8 @@
-
-
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
new file mode 100644
index 0000000..cdc9b25
--- /dev/null
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+ 同意
+
+
+ 拒绝
+
+
+ 驳回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 3e3ccb0..f29d997 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -69,3 +69,20 @@
responseType: 'blob',
})
}
+
+// 文件审批列表(分页)
+export function approvallistPageApi(data: any) {
+ return request({
+ url: `/meter/file/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+// 审批详情
+export function approvallistPageDetailApi(data: object) {
+ return request({
+ url: '/meter/file/approval/listPage',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index b0841fd..9a30ce3 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -35,4 +35,11 @@
data,
})
}
-
+// 获取标准装置列表
+export function standardlistPageApi(data: any) {
+ return request({
+ url: `/meter/standard/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
new file mode 100644
index 0000000..1678cdb
--- /dev/null
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 05d9034..c2682fc 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -1,23 +1,34 @@
-
-
-
@@ -328,7 +348,7 @@
-
+
@@ -340,33 +360,33 @@
-
+
-
+
-
+
-
+
-
+
@@ -375,26 +395,26 @@
-
+
-
+
-
+
-
+
扫描
@@ -409,7 +429,7 @@
@@ -418,22 +438,22 @@
-
+
-
-
+
+
@@ -441,12 +461,12 @@
-
+
-
+
@@ -458,21 +478,21 @@
v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
:tree-props="deptProps"
/>
-
+
-
+
-
+
@@ -481,8 +501,13 @@
-
-
+
+
+
@@ -490,7 +515,7 @@
@@ -499,14 +524,14 @@
-
+
@@ -515,21 +540,21 @@
-
+
-
+
-
+
@@ -539,24 +564,24 @@
-
+
-
+
-
+
-
+
@@ -565,78 +590,77 @@
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -646,19 +670,6 @@
-
-
-
@@ -671,10 +682,11 @@
-
+
{{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+ 暂无
@@ -685,22 +697,8 @@
-
-
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
new file mode 100644
index 0000000..cdc9b25
--- /dev/null
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+ 同意
+
+
+ 拒绝
+
+
+ 驳回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
new file mode 100644
index 0000000..9c4da0f
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -0,0 +1,540 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+
+ 暂无
+
+
+
+
+
+
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/12 20:46
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/3 20:46
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/2 20:46
+
+
+
+
+
+
+
+
+
+
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 3e3ccb0..f29d997 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -69,3 +69,20 @@
responseType: 'blob',
})
}
+
+// 文件审批列表(分页)
+export function approvallistPageApi(data: any) {
+ return request({
+ url: `/meter/file/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+// 审批详情
+export function approvallistPageDetailApi(data: object) {
+ return request({
+ url: '/meter/file/approval/listPage',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index b0841fd..9a30ce3 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -35,4 +35,11 @@
data,
})
}
-
+// 获取标准装置列表
+export function standardlistPageApi(data: any) {
+ return request({
+ url: `/meter/standard/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
new file mode 100644
index 0000000..1678cdb
--- /dev/null
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 05d9034..c2682fc 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -1,23 +1,34 @@
-
-
-
@@ -328,7 +348,7 @@
-
+
@@ -340,33 +360,33 @@
-
+
-
+
-
+
-
+
-
+
@@ -375,26 +395,26 @@
-
+
-
+
-
+
-
+
扫描
@@ -409,7 +429,7 @@
@@ -418,22 +438,22 @@
-
+
-
-
+
+
@@ -441,12 +461,12 @@
-
+
-
+
@@ -458,21 +478,21 @@
v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
:tree-props="deptProps"
/>
-
+
-
+
-
+
@@ -481,8 +501,13 @@
-
-
+
+
+
@@ -490,7 +515,7 @@
@@ -499,14 +524,14 @@
-
+
@@ -515,21 +540,21 @@
-
+
-
+
-
+
@@ -539,24 +564,24 @@
-
+
-
+
-
+
-
+
@@ -565,78 +590,77 @@
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -646,19 +670,6 @@
-
-
-
@@ -671,10 +682,11 @@
-
+
{{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+ 暂无
@@ -685,22 +697,8 @@
-
-
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
new file mode 100644
index 0000000..cdc9b25
--- /dev/null
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+ 同意
+
+
+ 拒绝
+
+
+ 驳回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
new file mode 100644
index 0000000..9c4da0f
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -0,0 +1,540 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+
+ 暂无
+
+
+
+
+
+
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/12 20:46
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/3 20:46
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/2 20:46
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
new file mode 100644
index 0000000..6ee2e8c
--- /dev/null
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -0,0 +1,395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新建
+
+
+ 导出
+
+
+ 打印
+
+
+
+
+
+
+
+ {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 同意
+
+
+ 驳回
+
+
+ 拒绝
+
+
+ 取消
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 3e3ccb0..f29d997 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -69,3 +69,20 @@
responseType: 'blob',
})
}
+
+// 文件审批列表(分页)
+export function approvallistPageApi(data: any) {
+ return request({
+ url: `/meter/file/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+// 审批详情
+export function approvallistPageDetailApi(data: object) {
+ return request({
+ url: '/meter/file/approval/listPage',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index b0841fd..9a30ce3 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -35,4 +35,11 @@
data,
})
}
-
+// 获取标准装置列表
+export function standardlistPageApi(data: any) {
+ return request({
+ url: `/meter/standard/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
new file mode 100644
index 0000000..1678cdb
--- /dev/null
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 05d9034..c2682fc 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -1,23 +1,34 @@
-
-
-
@@ -328,7 +348,7 @@
-
+
@@ -340,33 +360,33 @@
-
+
-
+
-
+
-
+
-
+
@@ -375,26 +395,26 @@
-
+
-
+
-
+
-
+
扫描
@@ -409,7 +429,7 @@
@@ -418,22 +438,22 @@
-
+
-
-
+
+
@@ -441,12 +461,12 @@
-
+
-
+
@@ -458,21 +478,21 @@
v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
:tree-props="deptProps"
/>
-
+
-
+
-
+
@@ -481,8 +501,13 @@
-
-
+
+
+
@@ -490,7 +515,7 @@
@@ -499,14 +524,14 @@
-
+
@@ -515,21 +540,21 @@
-
+
-
+
-
+
@@ -539,24 +564,24 @@
-
+
-
+
-
+
-
+
@@ -565,78 +590,77 @@
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -646,19 +670,6 @@
-
-
-
@@ -671,10 +682,11 @@
-
+
{{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+ 暂无
@@ -685,22 +697,8 @@
-
-
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
new file mode 100644
index 0000000..cdc9b25
--- /dev/null
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+ 同意
+
+
+ 拒绝
+
+
+ 驳回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
new file mode 100644
index 0000000..9c4da0f
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -0,0 +1,540 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+
+ 暂无
+
+
+
+
+
+
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/12 20:46
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/3 20:46
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/2 20:46
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
new file mode 100644
index 0000000..6ee2e8c
--- /dev/null
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -0,0 +1,395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新建
+
+
+ 导出
+
+
+ 打印
+
+
+
+
+
+
+
+ {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 同意
+
+
+ 驳回
+
+
+ 拒绝
+
+
+ 取消
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
new file mode 100644
index 0000000..5fb0163
--- /dev/null
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 3e3ccb0..f29d997 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -69,3 +69,20 @@
responseType: 'blob',
})
}
+
+// 文件审批列表(分页)
+export function approvallistPageApi(data: any) {
+ return request({
+ url: `/meter/file/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+// 审批详情
+export function approvallistPageDetailApi(data: object) {
+ return request({
+ url: '/meter/file/approval/listPage',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index b0841fd..9a30ce3 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -35,4 +35,11 @@
data,
})
}
-
+// 获取标准装置列表
+export function standardlistPageApi(data: any) {
+ return request({
+ url: `/meter/standard/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
new file mode 100644
index 0000000..1678cdb
--- /dev/null
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 05d9034..c2682fc 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -1,23 +1,34 @@
-
-
-
@@ -328,7 +348,7 @@
-
+
@@ -340,33 +360,33 @@
-
+
-
+
-
+
-
+
-
+
@@ -375,26 +395,26 @@
-
+
-
+
-
+
-
+
扫描
@@ -409,7 +429,7 @@
@@ -418,22 +438,22 @@
-
+
-
-
+
+
@@ -441,12 +461,12 @@
-
+
-
+
@@ -458,21 +478,21 @@
v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
:tree-props="deptProps"
/>
-
+
-
+
-
+
@@ -481,8 +501,13 @@
-
-
+
+
+
@@ -490,7 +515,7 @@
@@ -499,14 +524,14 @@
-
+
@@ -515,21 +540,21 @@
-
+
-
+
-
+
@@ -539,24 +564,24 @@
-
+
-
+
-
+
-
+
@@ -565,78 +590,77 @@
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -646,19 +670,6 @@
-
-
-
@@ -671,10 +682,11 @@
-
+
{{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+ 暂无
@@ -685,22 +697,8 @@
-
-
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
new file mode 100644
index 0000000..cdc9b25
--- /dev/null
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+ 同意
+
+
+ 拒绝
+
+
+ 驳回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
new file mode 100644
index 0000000..9c4da0f
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -0,0 +1,540 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+
+ 暂无
+
+
+
+
+
+
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/12 20:46
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/3 20:46
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/2 20:46
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
new file mode 100644
index 0000000..6ee2e8c
--- /dev/null
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -0,0 +1,395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新建
+
+
+ 导出
+
+
+ 打印
+
+
+
+
+
+
+
+ {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 同意
+
+
+ 驳回
+
+
+ 拒绝
+
+
+ 取消
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
new file mode 100644
index 0000000..5fb0163
--- /dev/null
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index fb2cffa..4b02b09 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -1,10 +1,10 @@
- 设备闲置申请
+
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 3e3ccb0..f29d997 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -69,3 +69,20 @@
responseType: 'blob',
})
}
+
+// 文件审批列表(分页)
+export function approvallistPageApi(data: any) {
+ return request({
+ url: `/meter/file/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+// 审批详情
+export function approvallistPageDetailApi(data: object) {
+ return request({
+ url: '/meter/file/approval/listPage',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index b0841fd..9a30ce3 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -35,4 +35,11 @@
data,
})
}
-
+// 获取标准装置列表
+export function standardlistPageApi(data: any) {
+ return request({
+ url: `/meter/standard/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
new file mode 100644
index 0000000..1678cdb
--- /dev/null
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 05d9034..c2682fc 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -1,23 +1,34 @@
-
-
-
@@ -328,7 +348,7 @@
-
+
@@ -340,33 +360,33 @@
-
+
-
+
-
+
-
+
-
+
@@ -375,26 +395,26 @@
-
+
-
+
-
+
-
+
扫描
@@ -409,7 +429,7 @@
@@ -418,22 +438,22 @@
-
+
-
-
+
+
@@ -441,12 +461,12 @@
-
+
-
+
@@ -458,21 +478,21 @@
v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
:tree-props="deptProps"
/>
-
+
-
+
-
+
@@ -481,8 +501,13 @@
-
-
+
+
+
@@ -490,7 +515,7 @@
@@ -499,14 +524,14 @@
-
+
@@ -515,21 +540,21 @@
-
+
-
+
-
+
@@ -539,24 +564,24 @@
-
+
-
+
-
+
-
+
@@ -565,78 +590,77 @@
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -646,19 +670,6 @@
-
-
-
@@ -671,10 +682,11 @@
-
+
{{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+ 暂无
@@ -685,22 +697,8 @@
-
-
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
new file mode 100644
index 0000000..cdc9b25
--- /dev/null
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+ 同意
+
+
+ 拒绝
+
+
+ 驳回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
new file mode 100644
index 0000000..9c4da0f
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -0,0 +1,540 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+
+ 暂无
+
+
+
+
+
+
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/12 20:46
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/3 20:46
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/2 20:46
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
new file mode 100644
index 0000000..6ee2e8c
--- /dev/null
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -0,0 +1,395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新建
+
+
+ 导出
+
+
+ 打印
+
+
+
+
+
+
+
+ {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 同意
+
+
+ 驳回
+
+
+ 拒绝
+
+
+ 取消
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
new file mode 100644
index 0000000..5fb0163
--- /dev/null
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index fb2cffa..4b02b09 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -1,10 +1,10 @@
- 设备闲置申请
+
diff --git a/src/views/measure/file/components/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
index 8e08302..50ea492 100644
--- a/src/views/measure/file/components/approve/passed.vue
+++ b/src/views/measure/file/components/approve/passed.vue
@@ -4,5 +4,5 @@
-
+
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 3e3ccb0..f29d997 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -69,3 +69,20 @@
responseType: 'blob',
})
}
+
+// 文件审批列表(分页)
+export function approvallistPageApi(data: any) {
+ return request({
+ url: `/meter/file/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+// 审批详情
+export function approvallistPageDetailApi(data: object) {
+ return request({
+ url: '/meter/file/approval/listPage',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index b0841fd..9a30ce3 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -35,4 +35,11 @@
data,
})
}
-
+// 获取标准装置列表
+export function standardlistPageApi(data: any) {
+ return request({
+ url: `/meter/standard/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
new file mode 100644
index 0000000..1678cdb
--- /dev/null
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 05d9034..c2682fc 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -1,23 +1,34 @@
-
-
-
@@ -328,7 +348,7 @@
-
+
@@ -340,33 +360,33 @@
-
+
-
+
-
+
-
+
-
+
@@ -375,26 +395,26 @@
-
+
-
+
-
+
-
+
扫描
@@ -409,7 +429,7 @@
@@ -418,22 +438,22 @@
-
+
-
-
+
+
@@ -441,12 +461,12 @@
-
+
-
+
@@ -458,21 +478,21 @@
v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
:tree-props="deptProps"
/>
-
+
-
+
-
+
@@ -481,8 +501,13 @@
-
-
+
+
+
@@ -490,7 +515,7 @@
@@ -499,14 +524,14 @@
-
+
@@ -515,21 +540,21 @@
-
+
-
+
-
+
@@ -539,24 +564,24 @@
-
+
-
+
-
+
-
+
@@ -565,78 +590,77 @@
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -646,19 +670,6 @@
-
-
-
@@ -671,10 +682,11 @@
-
+
{{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+ 暂无
@@ -685,22 +697,8 @@
-
-
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
new file mode 100644
index 0000000..cdc9b25
--- /dev/null
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+ 同意
+
+
+ 拒绝
+
+
+ 驳回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
new file mode 100644
index 0000000..9c4da0f
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -0,0 +1,540 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+
+ 暂无
+
+
+
+
+
+
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/12 20:46
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/3 20:46
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/2 20:46
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
new file mode 100644
index 0000000..6ee2e8c
--- /dev/null
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -0,0 +1,395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新建
+
+
+ 导出
+
+
+ 打印
+
+
+
+
+
+
+
+ {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 同意
+
+
+ 驳回
+
+
+ 拒绝
+
+
+ 取消
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
new file mode 100644
index 0000000..5fb0163
--- /dev/null
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index fb2cffa..4b02b09 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -1,10 +1,10 @@
- 设备闲置申请
+
diff --git a/src/views/measure/file/components/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
index 8e08302..50ea492 100644
--- a/src/views/measure/file/components/approve/passed.vue
+++ b/src/views/measure/file/components/approve/passed.vue
@@ -4,5 +4,5 @@
-
+
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index c0e4c86..44e3e4d 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -4,7 +4,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
// import addDialog from './addDialog.vue'
// import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { approvallistPageApi, approvallistPageDetailApi } from '@/api/measure/file'
import { getDictByCode } from '@/api/system/dict'
import { exportExcel } from '@/utils/exportXlsx'
// import { uploadApi } from '@/api/system/notice'
@@ -13,18 +13,23 @@
type: String,
default: '',
},
+ value: {
+ type: String,
+ default: '',
+ },
})
const searchQuery = reactive({
fileNo: '', // 编号
fileName: '', // 名称
publishTime: '', // 发布时间
fileCode: '', // 文件号
- effectiveTime: '', // 实施时间
- effectiveStatus: '', // 实施状态
+ createUser: '', // 创建人
+ createTime: '', // 创建
+ approvalStatus: props.value, // 审批状态
limit: 10,
offset: 1,
fileType: '', // 类型
- create: '', // 创建人
+ formId: '',
}) // 查询参数
const loadingTable = ref(false) // 表格loading
const total = ref(0) // 数据总条数
@@ -66,19 +71,19 @@
fileTypeList.value = res.data
searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
}
-// const effectiveStatusSelect = ref([])
-// 获取实施状态
-// const getStatus = () => {
-// getDictByCode('effectiveStatus').then((res) => {
-// if (res.code === 200) {
-// effectiveStatusSelect.value = res.data
-// }
-// })
-// }
+const approvalStatus = ref([])
+// 获取审批状态
+const getStatus = () => {
+ getDictByCode('approvalStatus').then((res) => {
+ if (res.code === 200) {
+ approvalStatus.value = res.data
+ }
+ })
+}
// 获取数据列表
const getList = () => {
loadingTable.value = true
- listPageApi(searchQuery).then((res) => {
+ approvallistPageApi(searchQuery).then((res) => {
if (res.code === 200) {
list.value = res.data.rows
total.value = res.data.total
@@ -255,10 +260,10 @@
// dialogVisible.value = false
// }
onMounted(() => {
- // getStatus()
- getType().then((_) => {
- getList()
- })
+ getStatus()
+ // getType().then((_) => {
+ getList()
+ // })
})
@@ -290,10 +295,10 @@
@@ -303,7 +308,7 @@
class="normal-date"
style="width: 130px;"
/> -->
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 05d9034..c2682fc 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -1,23 +1,34 @@
-
-
-
@@ -328,7 +348,7 @@
-
+
@@ -340,33 +360,33 @@
-
+
-
+
-
+
-
+
-
+
@@ -375,26 +395,26 @@
-
+
-
+
-
+
-
+
扫描
@@ -409,7 +429,7 @@
@@ -418,22 +438,22 @@
-
+
-
-
+
+
@@ -441,12 +461,12 @@
-
+
-
+
@@ -458,21 +478,21 @@
v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
:tree-props="deptProps"
/>
-
+
-
+
-
+
@@ -481,8 +501,13 @@
-
-
+
+
+
@@ -490,7 +515,7 @@
@@ -499,14 +524,14 @@
-
+
@@ -515,21 +540,21 @@
-
+
-
+
-
+
@@ -539,24 +564,24 @@
-
+
-
+
-
+
-
+
@@ -565,78 +590,77 @@
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -646,19 +670,6 @@
-
-
-
@@ -671,10 +682,11 @@
-
+
{{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+ 暂无
@@ -685,22 +697,8 @@
-
-
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
new file mode 100644
index 0000000..cdc9b25
--- /dev/null
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+ 同意
+
+
+ 拒绝
+
+
+ 驳回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
new file mode 100644
index 0000000..9c4da0f
--- /dev/null
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -0,0 +1,540 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+
+ 暂无
+
+
+
+
+
+
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/12 20:46
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/3 20:46
+
+
+
+
+ Update Github template
+ Tom committed 2018/4/2 20:46
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
new file mode 100644
index 0000000..6ee2e8c
--- /dev/null
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -0,0 +1,395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新建
+
+
+ 导出
+
+
+ 打印
+
+
+
+
+
+
+
+ {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 同意
+
+
+ 驳回
+
+
+ 拒绝
+
+
+ 取消
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/components/templatePage.vue b/src/views/device/stateManage/components/templatePage.vue
new file mode 100644
index 0000000..5fb0163
--- /dev/null
+++ b/src/views/device/stateManage/components/templatePage.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index fb2cffa..4b02b09 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -1,10 +1,10 @@
- 设备闲置申请
+
diff --git a/src/views/measure/file/components/approve/passed.vue b/src/views/measure/file/components/approve/passed.vue
index 8e08302..50ea492 100644
--- a/src/views/measure/file/components/approve/passed.vue
+++ b/src/views/measure/file/components/approve/passed.vue
@@ -4,5 +4,5 @@
-
+
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index c0e4c86..44e3e4d 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -4,7 +4,7 @@
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
// import addDialog from './addDialog.vue'
// import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { approvallistPageApi, approvallistPageDetailApi } from '@/api/measure/file'
import { getDictByCode } from '@/api/system/dict'
import { exportExcel } from '@/utils/exportXlsx'
// import { uploadApi } from '@/api/system/notice'
@@ -13,18 +13,23 @@
type: String,
default: '',
},
+ value: {
+ type: String,
+ default: '',
+ },
})
const searchQuery = reactive({
fileNo: '', // 编号
fileName: '', // 名称
publishTime: '', // 发布时间
fileCode: '', // 文件号
- effectiveTime: '', // 实施时间
- effectiveStatus: '', // 实施状态
+ createUser: '', // 创建人
+ createTime: '', // 创建
+ approvalStatus: props.value, // 审批状态
limit: 10,
offset: 1,
fileType: '', // 类型
- create: '', // 创建人
+ formId: '',
}) // 查询参数
const loadingTable = ref(false) // 表格loading
const total = ref(0) // 数据总条数
@@ -66,19 +71,19 @@
fileTypeList.value = res.data
searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
}
-// const effectiveStatusSelect = ref([])
-// 获取实施状态
-// const getStatus = () => {
-// getDictByCode('effectiveStatus').then((res) => {
-// if (res.code === 200) {
-// effectiveStatusSelect.value = res.data
-// }
-// })
-// }
+const approvalStatus = ref([])
+// 获取审批状态
+const getStatus = () => {
+ getDictByCode('approvalStatus').then((res) => {
+ if (res.code === 200) {
+ approvalStatus.value = res.data
+ }
+ })
+}
// 获取数据列表
const getList = () => {
loadingTable.value = true
- listPageApi(searchQuery).then((res) => {
+ approvallistPageApi(searchQuery).then((res) => {
if (res.code === 200) {
list.value = res.data.rows
total.value = res.data.total
@@ -255,10 +260,10 @@
// dialogVisible.value = false
// }
onMounted(() => {
- // getStatus()
- getType().then((_) => {
- getList()
- })
+ getStatus()
+ // getType().then((_) => {
+ getList()
+ // })
})
@@ -290,10 +295,10 @@
@@ -303,7 +308,7 @@
class="normal-date"
style="width: 130px;"
/> -->
-
+