From 8f4f83af6ce2a1468042bf60678cc49daf1beb3b Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 16:48:39 +0800
Subject: [PATCH] 台账查询/物品查询
---
admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue | 19 -----
/dev/null | 111 -------------------------------------
admin-web/src/components/myTable/myTable.vue | 2
admin-web/src/components/myTable/myTableV2.vue | 2
admin-web/src/views/departmentitem/ledgerquy/itemQuy/index.vue | 19 -----
5 files changed, 6 insertions(+), 147 deletions(-)
diff --git a/admin-web/src/components/myTable/myTable.vue b/admin-web/src/components/myTable/myTable.vue
index 9ee89bf..9fcc7ce 100644
--- a/admin-web/src/components/myTable/myTable.vue
+++ b/admin-web/src/components/myTable/myTable.vue
@@ -33,7 +33,7 @@
<el-button size="mini" type="default" @click="visible = false">鍙栨秷</el-button>
<el-button type="primary" size="mini" @click="_export_">纭畾</el-button>
</div>
- <my-button v-if="myTable.tools.generalExport.show" slot="reference" site="tools" name="瀵煎嚭" />
+ <my-button v-if="myTable.tools.generalExport.show" slot="reference" site="tools" name="瀵煎嚭" style="margin-bottom: 15px"/>
</el-popover>
<!--鍒楁帶鍒�-->
diff --git a/admin-web/src/components/myTable/myTableV2.vue b/admin-web/src/components/myTable/myTableV2.vue
index 6afb0f1..be5cf3f 100644
--- a/admin-web/src/components/myTable/myTableV2.vue
+++ b/admin-web/src/components/myTable/myTableV2.vue
@@ -33,7 +33,7 @@
<el-button size="mini" type="default" @click="visible = false">鍙栨秷</el-button>
<el-button type="primary" size="mini" @click="_export_">纭畾</el-button>
</div>
- <my-button v-if="myTable.tools.generalExport.show" slot="reference" site="tools" name="瀵煎嚭" />
+ <my-button v-if="myTable.tools.generalExport.show" slot="reference" site="tools" name="瀵煎嚭" style="margin-bottom: 15px"/>
</el-popover>
<!--鍒楁帶鍒�-->
diff --git a/admin-web/src/views/departmentitem/ledgerquy/itemQuy/edit.vue b/admin-web/src/views/departmentitem/ledgerquy/itemQuy/edit.vue
deleted file mode 100644
index 37b0db9..0000000
--- a/admin-web/src/views/departmentitem/ledgerquy/itemQuy/edit.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
- <win-sm :title="setting.title" @close="close" :width="'800px'">
- <el-form ref="ruleForm" :model="formData" :rules="rules" class="demo-ruleForm" label-width="100px">
- <el-form-item label="缂栧彿" prop="code">
- <el-input disabled v-model="formData.code" clearable maxlength="20" show-word-limit style="width: 100%"/>
- </el-form-item>
- <el-form-item label="浠撳簱鍚嶇О" prop="name">
- <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%"/>
- </el-form-item>
- <el-form-item label="鍦板潃" >
- <el-input v-model="formData.adss" clearable maxlength="20" show-word-limit style="width: 100%"/>
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-switch
- v-model="formData.status"
- active-color="#0d997c"
- inactive-color="#C0CCDA">
- </el-switch>
- </el-form-item>
- </el-form>
- <div slot="footer" align="center" class="dialog-footer">
- <my-button name="鍙栨秷" site="form" @click="close"/>
- <my-button name="淇濆瓨" site="form" @click="save"/>
- </div>
- </win-sm>
-</template>
-
-<script>
-import winSm from '@/components/win/win-sm'
-import myButton from '@/components/myButton/myButton'
-import * as finsystenant from '@/api/baseSetting/finsystenant'
-
-export default {
- components: {winSm, myButton},
- props: {
- setting: {
- type: Object,
- default: () => {
- }
- }
- },
- data() {
- return {
- checkAll: false,
- checkedList: [],
- formData: {
- code: '',
- name: '',
- status: true,
- summary: '',
- },
- rules: {
- code: [
- {required: true, message: '璇疯緭鍏ユ満鏋勭紪鍙�', trigger: 'blur'}
- ],
- name: [
- {required: true, message: '璇疯緭鍏ユ満鏋勫悕绉�', trigger: 'blur'}
- ],
- status: [
- {required: true, message: '璇烽�夋嫨鐘舵��', trigger: 'blur'}
- ]
- }
- }
- },
- created() {
- if(this.setting.info){
- this.formData = Object.assign({},JSON.parse(this.setting.info))
- }
- },
- methods: {
- getEditInfo(id){
-
- },
- close() {
- this.$emit('close')
- },
- save() {
- this.$refs.ruleForm.validate((valid) => {
- if (valid) {
- const params = Object.assign({}, this.formData)
- if(this.setting.id){
- // 缂栬緫鎺ュ彛
- finsystenant.edit(params).then(res => {
- if (res) {
- this.$message.success('淇濆瓨鎴愬姛锛�')
- this.close()
- this.$emit('search')
- } else {
- this.$message.error('淇濆瓨澶辫触')
- }
- })
- }else{
- params.orgId = this.setting.orgId
- finsystenant.add(params).then(res => {
- if (res) {
- this.$message.success('淇濆瓨鎴愬姛锛�')
- this.close()
- this.$emit('search')
- } else {
- this.$message.error('淇濆瓨澶辫触')
- }
- })
- }
- } else {
- this.$message.error('鏍￠獙鏈�氳繃锛岃妫�鏌ャ��')
- }
- })
- }
- }
-}
-</script>
diff --git a/admin-web/src/views/departmentitem/ledgerquy/itemQuy/index.vue b/admin-web/src/views/departmentitem/ledgerquy/itemQuy/index.vue
index cdc889c..9778858 100644
--- a/admin-web/src/views/departmentitem/ledgerquy/itemQuy/index.vue
+++ b/admin-web/src/views/departmentitem/ledgerquy/itemQuy/index.vue
@@ -100,7 +100,7 @@
show: false
},
generalExport: {// 閫氱敤瀵煎嚭鎸夐挳
- show: false
+ show: true
},
// 鑷畾涔夊伐鍏锋潯鎸夐挳
custom: [
@@ -119,16 +119,7 @@
],
// 鎿嶄綔淇℃伅
operation: {
- show: true, // 鏄剧ず鎿嶄綔鍒�
- width: '150', // 鍒楀
- attr: [
- {
- title: '璇︽儏',
- events: (row) => {
- this.showAudit(row);
- },
- },
- ],
+ show: false // 鏄剧ず鎿嶄綔鍒�
},
paging: {
show: true, // 鏄剧ず鍒嗛〉
@@ -146,12 +137,6 @@
created() {
},
methods: {
- showAudit(row) {
- this.editSetting.id = row.id;
- this.editSetting.info = JSON.stringify(row);
- this.editSetting.title = '缂栬緫';
- this.editSetting.show = true;
- },
// 鏌ヨtable鍒楄〃
search(pageNum) {
if (pageNum != undefined) {
diff --git a/admin-web/src/views/departmentitem/ledgerquy/ledQuy/edit.vue b/admin-web/src/views/departmentitem/ledgerquy/ledQuy/edit.vue
deleted file mode 100644
index 37b0db9..0000000
--- a/admin-web/src/views/departmentitem/ledgerquy/ledQuy/edit.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
- <win-sm :title="setting.title" @close="close" :width="'800px'">
- <el-form ref="ruleForm" :model="formData" :rules="rules" class="demo-ruleForm" label-width="100px">
- <el-form-item label="缂栧彿" prop="code">
- <el-input disabled v-model="formData.code" clearable maxlength="20" show-word-limit style="width: 100%"/>
- </el-form-item>
- <el-form-item label="浠撳簱鍚嶇О" prop="name">
- <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%"/>
- </el-form-item>
- <el-form-item label="鍦板潃" >
- <el-input v-model="formData.adss" clearable maxlength="20" show-word-limit style="width: 100%"/>
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-switch
- v-model="formData.status"
- active-color="#0d997c"
- inactive-color="#C0CCDA">
- </el-switch>
- </el-form-item>
- </el-form>
- <div slot="footer" align="center" class="dialog-footer">
- <my-button name="鍙栨秷" site="form" @click="close"/>
- <my-button name="淇濆瓨" site="form" @click="save"/>
- </div>
- </win-sm>
-</template>
-
-<script>
-import winSm from '@/components/win/win-sm'
-import myButton from '@/components/myButton/myButton'
-import * as finsystenant from '@/api/baseSetting/finsystenant'
-
-export default {
- components: {winSm, myButton},
- props: {
- setting: {
- type: Object,
- default: () => {
- }
- }
- },
- data() {
- return {
- checkAll: false,
- checkedList: [],
- formData: {
- code: '',
- name: '',
- status: true,
- summary: '',
- },
- rules: {
- code: [
- {required: true, message: '璇疯緭鍏ユ満鏋勭紪鍙�', trigger: 'blur'}
- ],
- name: [
- {required: true, message: '璇疯緭鍏ユ満鏋勫悕绉�', trigger: 'blur'}
- ],
- status: [
- {required: true, message: '璇烽�夋嫨鐘舵��', trigger: 'blur'}
- ]
- }
- }
- },
- created() {
- if(this.setting.info){
- this.formData = Object.assign({},JSON.parse(this.setting.info))
- }
- },
- methods: {
- getEditInfo(id){
-
- },
- close() {
- this.$emit('close')
- },
- save() {
- this.$refs.ruleForm.validate((valid) => {
- if (valid) {
- const params = Object.assign({}, this.formData)
- if(this.setting.id){
- // 缂栬緫鎺ュ彛
- finsystenant.edit(params).then(res => {
- if (res) {
- this.$message.success('淇濆瓨鎴愬姛锛�')
- this.close()
- this.$emit('search')
- } else {
- this.$message.error('淇濆瓨澶辫触')
- }
- })
- }else{
- params.orgId = this.setting.orgId
- finsystenant.add(params).then(res => {
- if (res) {
- this.$message.success('淇濆瓨鎴愬姛锛�')
- this.close()
- this.$emit('search')
- } else {
- this.$message.error('淇濆瓨澶辫触')
- }
- })
- }
- } else {
- this.$message.error('鏍￠獙鏈�氳繃锛岃妫�鏌ャ��')
- }
- })
- }
- }
-}
-</script>
diff --git a/admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue b/admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue
index 532bb3f..793de65 100644
--- a/admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue
+++ b/admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue
@@ -137,7 +137,7 @@
},
generalExport: {
// 閫氱敤瀵煎嚭鎸夐挳
- show: false,
+ show: true,
},
// 鑷畾涔夊伐鍏锋潯鎸夐挳
custom: [],
@@ -165,16 +165,7 @@
],
// 鎿嶄綔淇℃伅
operation: {
- show: true, // 鏄剧ず鎿嶄綔鍒�
- width: '150', // 鍒楀
- attr: [
- {
- title: '璇︽儏',
- events: (row) => {
- this.showAudit(row);
- },
- },
- ],
+ show: false // 鏄剧ず鎿嶄綔鍒�
},
paging: {
show: true, // 鏄剧ず鍒嗛〉
@@ -191,12 +182,6 @@
},
created() {},
methods: {
- showAudit(row) {
- this.editSetting.id = row.id;
- this.editSetting.info = JSON.stringify(row);
- this.editSetting.title = '缂栬緫';
- this.editSetting.show = true;
- },
// 鏌ヨtable鍒楄〃
search(pageNum) {
if (pageNum != undefined) {
--
Gitblit v1.9.1