From f26c8a97c6090412cfbf4dd6a6877ebff782dffc Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Mon, 30 Aug 2021 11:47:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/borrow/borrow.vue | 6 +++---
src/views/ysjl/3000/common/inspection-items.vue | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/borrow/borrow.vue b/src/views/borrow/borrow.vue
index 69bbc26..9694dc0 100644
--- a/src/views/borrow/borrow.vue
+++ b/src/views/borrow/borrow.vue
@@ -133,9 +133,9 @@ export default {
{ slot: 'operation' }
],
permission: {
- add: ['instrument:add'],
+ add: ['borrow:jybg-list:add'],
edit: ['borrow:jybg-list:update'],
- del: ['instrument:delete']
+ del: ['borrow:jybg-list:delete']
},
options: [],
form: {
@@ -251,7 +251,7 @@ export default {
addBorrowFn(this.form).then(res => {
this.$message({ message: '借阅成功', type: 'success' })
this.visible = false
- // crud.refresh()
+ this.crud.refresh()
})
},
// EXCEL上传方法
diff --git a/src/views/ysjl/3000/common/inspection-items.vue b/src/views/ysjl/3000/common/inspection-items.vue
index bf8ddb0..3ae98ca 100644
--- a/src/views/ysjl/3000/common/inspection-items.vue
+++ b/src/views/ysjl/3000/common/inspection-items.vue
@@ -66,7 +66,7 @@ export default {
},
data() {
return {
- jyjgList: [{ value: '√' }, { value: '×' }, { value: '/' }]
+ jyjgList: [{ value: '√' }, { value: '×' }, { value: '/' }, { value: '○' }]
}
},
created() {
From 1c8bcfac5efbbd24443c33802784421a602b8b60 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Mon, 30 Aug 2021 16:35:46 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/archive/list.vue | 22 +++----------------
src/views/bjd/dj_input.vue | 6 +----
src/views/borrow/borrow.vue | 2 +-
.../device_management/components/Move.vue | 2 +-
4 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/src/views/archive/list.vue b/src/views/archive/list.vue
index e6f8883..e6dfc75 100644
--- a/src/views/archive/list.vue
+++ b/src/views/archive/list.vue
@@ -17,14 +17,6 @@
-
-
-
-
-
-
-
-
@@ -34,18 +26,10 @@
-
-
-
-
-
+
+ 查询
+
-
-
-
-
- 查询
-
diff --git a/src/views/bjd/dj_input.vue b/src/views/bjd/dj_input.vue
index 6a2ef42..1f4abc9 100644
--- a/src/views/bjd/dj_input.vue
+++ b/src/views/bjd/dj_input.vue
@@ -1370,11 +1370,7 @@
@row-click="checkSelection"
>
-
-
-
-
-
+
Date: Mon, 30 Aug 2021 16:47:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/bjd/dj_input.vue | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/src/views/bjd/dj_input.vue b/src/views/bjd/dj_input.vue
index 1f4abc9..25ee282 100644
--- a/src/views/bjd/dj_input.vue
+++ b/src/views/bjd/dj_input.vue
@@ -1997,20 +1997,6 @@ export default {
if (this.addRowIndex !== null && this.addRowIndex.length > 0) {
let baseIds = ''
for (let i = 0; i < this.addRowIndex.length; i++) {
- for (let i = 0; i < this.tableData.length; i++) {
- if (
- this.tableData[i].zhucedaima ===
- this.baseList[this.addRowIndex[i]].zhucedaima
- ) {
- return true
- }
- if (
- this.tableData[i].shiyongdengjibianhao ===
- this.baseList[this.addRowIndex[i]].shiyongdengjibianhao
- ) {
- return true
- }
- }
baseIds += this.baseList[this.addRowIndex[i]].id + ','
}
if (this.formState === 'update') {