From 004d3fdba7d6819aa2fcb32cd954d45bfaf111a4 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 21 十一月 2023 09:49:21 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS-WEB/src/components/Master/MasterEditBulk.vue | 40 ++++++++++++++++++++++++++++++++++++++++
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 4 +++-
Source/UBCS-WEB/src/components/BatchImport/index.vue | 2 +-
3 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index 3df3124..765863f 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -190,7 +190,7 @@
upParams: "classifyAttr",
},
batchImportApply: {
- title: "鎵归噺鐢宠缂栫爜",
+ title: "鎵归噺瀵煎叆鐢宠",
tipList: [
"1.鏍囬甯︿簲瑙掓槦鐨勮〃绀哄叧閿睘鎬э紝甯︽槦鍙疯〃绀哄繀杈撻」",
"2.璇蜂竴瀹氬厛閫夋嫨/杈撳叆缂栫爜瑙勫垯鐨勭爜娈靛�煎悗鍐嶉�夋嫨excel鏂囦欢",
diff --git a/Source/UBCS-WEB/src/components/Master/MasterEditBulk.vue b/Source/UBCS-WEB/src/components/Master/MasterEditBulk.vue
new file mode 100644
index 0000000..6853226
--- /dev/null
+++ b/Source/UBCS-WEB/src/components/Master/MasterEditBulk.vue
@@ -0,0 +1,40 @@
+<template>
+ <el-dialog
+ v-if="dialogVisible"
+ v-dialogDrag
+ title="鎵归噺淇敼"
+ :visible.sync="dialogVisible"
+ append-to-body
+ ></el-dialog>
+</template>
+
+<script>
+export default {
+ name: "MasterEditBulk",
+ props: {
+ visible: {
+ type: Boolean,
+ default: false,
+ },
+ },
+ data(){
+ return{
+
+ }
+ },
+ computed:{
+ dialogVisible: {
+ get() {
+ return this.visible;
+ },
+ set(val) {
+ this.$emit("update:visible", val);
+ },
+ },
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index af69b6f..cb2027c 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -100,7 +100,7 @@
:visible.sync="editvisible"
type="edit" @submit="EditSumbit"></FormTemplateDialog>
<!-- 鎵归噺缂栬緫-->
- <FormBulkEdit :visible.sync="bulkeditvisible"></FormBulkEdit>
+ <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>
<!-- 鏁版嵁璇︽儏-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
:rowOid="this.LinkObject.oid" :templateOid="templateOid"
@@ -179,6 +179,7 @@
import SetPersonnel from "@/components/template/SetPersonnel";
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
import BatchImport from '@/components/BatchImport'
+import MasterEditBulk from '@/components/Master/MasterEditBulk'
import {validatenull} from "@/util/validate";
import fileInHtml from "@/components/file/inHtml.vue";
import {getUserInfo} from "@/api/system/user";
@@ -191,6 +192,7 @@
ResembleQueryDialog,
BatchImport,
fileInHtml,
+ MasterEditBulk
},
name: "Crud.vue",
props: {
--
Gitblit v1.9.3