From 52a5cabb6d628bf758b4380eef51051e33abdae4 Mon Sep 17 00:00:00 2001
From: xiaobai <857694115@qq.com>
Date: Mon, 26 Jul 2021 17:56:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawerDialog/index.vue | 41 +++++++++++++++++++++++----
src/views/archive/archive_scan.vue | 4 +--
src/views/archive/list.vue | 8 +++---
src/views/dic/category.vue | 12 ++++----
src/views/flow/template.vue | 16 +++++++----
5 files changed, 58 insertions(+), 23 deletions(-)
diff --git a/src/components/drawerDialog/index.vue b/src/components/drawerDialog/index.vue
index c9a1968..aefce79 100644
--- a/src/components/drawerDialog/index.vue
+++ b/src/components/drawerDialog/index.vue
@@ -10,7 +10,7 @@
编辑模板
-
+
{{ formTemplate.tempName }}
@@ -649,13 +649,31 @@ export default {
parentList: {
type: Array,
default: () => []
+ },
+ type: {
+ type: Number,
+ default: 0
}
},
data() {
return {
activeName: 0,
settingList: [],
- formTemplate: {},
+ formTemplate: {
+ tempName: '',
+ tempCategory: '',
+ bglx: '',
+ jianyanleibie: '',
+ shebeizhongleidaima: '',
+ shebeileibiedaima: '',
+ tempPath: '',
+ jianyanyiju: '',
+ withDicCode: '',
+ parentId: '',
+ version: '',
+ sort: '',
+ cleanState: ''
+ },
templateSettingId: '',
dialogVisible1: false,
formLabelAlign: {
@@ -771,7 +789,9 @@ export default {
this.form.templateId = this.id
this.formLabelAlign.templateId = this.id
this.getList()
- this.loadFormData(this.index)
+ if (this.id) {
+ this.loadFormData(this.index)
+ }
this.getSbList(undefined, undefined, 1)
this.getBglxList()
this.getJylbList()
@@ -1018,7 +1038,7 @@ export default {
},
getCategoryList(type, parentCode, species) {
this.api({
- url: '/category/getCategoryList',
+ url: '/category/all',
method: 'get',
params: {
parentCode: parentCode,
@@ -1056,9 +1076,20 @@ export default {
)
},
update() {
+ let methods = ''
+ if (this.id) {
+ if (this.type === 1) {
+ delete this.formTemplate.id
+ methods = 'post'
+ } else {
+ methods = 'put'
+ }
+ } else {
+ methods = 'post'
+ }
this.api({
url: '/template',
- method: 'put',
+ method: methods,
data: this.formTemplate
}).then(_ => {
this.$emit('closeTemplateDrawer')
diff --git a/src/views/archive/archive_scan.vue b/src/views/archive/archive_scan.vue
index d238f0e..750e2af 100644
--- a/src/views/archive/archive_scan.vue
+++ b/src/views/archive/archive_scan.vue
@@ -90,8 +90,8 @@ export default {
this.$nextTick(() => {
this.jianyijiahao = this.frameNums
if (this.isAppend) {
- this.server({
- url: '/archive/archive/getArchiveInfo/' + this.id,
+ this.api({
+ url: '/archive/getArchiveInfo/' + this.id,
method: 'get'
}).then(data => {
this.archive = data.archive
diff --git a/src/views/archive/list.vue b/src/views/archive/list.vue
index 038f7b0..d4a7e85 100644
--- a/src/views/archive/list.vue
+++ b/src/views/archive/list.vue
@@ -110,8 +110,8 @@ export default {
},
methods: {
getList() {
- this.server({
- url: '/archive/archive/archiveList',
+ this.api({
+ url: '/archive/list',
method: 'get',
params: this.listQuery
}).then(data => {
@@ -134,8 +134,8 @@ export default {
},
// 获取架编号输入建议框
getFrameNums() {
- this.server({
- url: '/archive/archive/listFrameNums',
+ this.api({
+ url: '/archive/listFrameNums',
method: 'get'
}).then((response) => {
this.jianyijiahao = response
diff --git a/src/views/dic/category.vue b/src/views/dic/category.vue
index 0e478cc..03096f6 100644
--- a/src/views/dic/category.vue
+++ b/src/views/dic/category.vue
@@ -43,7 +43,7 @@
-
+
@@ -148,7 +148,7 @@ export default {
sbzlList: [],
species: [],
parentList: [],
- leftList:[]
+ leftList: []
}
},
created() {
@@ -284,13 +284,13 @@ export default {
this.parentList = data
})
},
- getLeftList(){
- this.api({
+ getLeftList() {
+ this.api({
url: '/getTopLevel',
method: 'get',
params: {
- pageNum:10,
- pageSize:10
+ pageNum: 10,
+ pageSize: 10
}
}).then(data => {
this.leftList = data
diff --git a/src/views/flow/template.vue b/src/views/flow/template.vue
index 91b3068..618f763 100644
--- a/src/views/flow/template.vue
+++ b/src/views/flow/template.vue
@@ -178,7 +178,7 @@
size="mini"
circle
title="复制"
- @click="copyTemplate(scope.$index)"
+ @click="copyTemplate(scope.row,scope.$index)"
>
@@ -235,7 +235,7 @@
-
+