From 871f60582720a8aa94a2d8bb344544452d4f3c23 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 29 六月 2023 17:07:23 +0800
Subject: [PATCH] 导入按钮
---
Source/UBCS-WEB/src/api/batchImport/index.js | 4
Source/UBCS-WEB/src/mixins/codeApply.js | 4 +
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 19 +++++-
Source/UBCS-WEB/src/components/BatchImport/index.vue | 94 +++++++++++++++++++------------
Source/UBCS-WEB/vue.config.js | 4
5 files changed, 81 insertions(+), 44 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/batchImport/index.js b/Source/UBCS-WEB/src/api/batchImport/index.js
index e27fd9b..a586e7e 100644
--- a/Source/UBCS-WEB/src/api/batchImport/index.js
+++ b/Source/UBCS-WEB/src/api/batchImport/index.js
@@ -10,8 +10,8 @@
responseType: 'blob'
})
}
-// 鎵归噺鐢宠缂栫爜椤跺眰鑺傜偣妯℃澘涓嬭浇
-export const downloadCodeApplyTopTemplate = (params) => {
+// 鎵归噺鐢宠缂栫爜妯℃澘涓嬭浇
+export const downloadBatchApplyCodeTemplate = (params) => {
return request({
url: '/api/ubcs-code/mdmEngineController/downloadTopImportExcel',
method: 'get',
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index b7d08ea..b517e50 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -12,17 +12,26 @@
{{ item }}
</li>
</ul>
- <div class="radio_box" v-show="currentTypeObj[type]['upParams'] === 'classifyAttr'">
+ <div
+ class="radio_box"
+ v-show="currentTypeObj[type]['upParams'] === 'classifyAttr'"
+ >
<span>鍒嗙被鐨勮矾寰勪娇鐢ㄧ殑灞炴��:</span>
<el-radio-group v-model="classifyAttr">
<el-radio label="id">鍒嗙被缂栧彿</el-radio>
<el-radio label="name">鍒嗙被鍚嶇О</el-radio>
</el-radio-group>
</div>
- <div style="margin-top: 20px;" v-if="showCodeApply && type === 'batchImportApply'">
- <Divider text="缂栫爜瑙勫垯鐨勭爜娈典俊鎭紝璇峰厛閫夋嫨鍚庡啀瀵煎叆" left="30px"></Divider>
+ <div
+ style="margin-top: 20px"
+ v-if="showCodeApply && currentTypeObj[type]['upParams'] === 'codeApply'"
+ >
+ <Divider
+ text="缂栫爜瑙勫垯鐨勭爜娈典俊鎭紝璇峰厛閫夋嫨鍚庡啀瀵煎叆"
+ left="30px"
+ ></Divider>
<FormTemplate
- style="margin-top: 30px;"
+ style="margin-top: 30px"
type="add"
:selfColumnType="selfColumnType"
:selfColumnConfig="selfColumnConfig"
@@ -76,11 +85,12 @@
downloadHistoryImportTemplate,
downloadErrorFile,
getHistoryLeftTree,
- downloadBatchImportApplyTemplate
+ downloadBatchImportApplyTemplate,
+ downloadBatchApplyCodeTemplate,
} from "../../api/batchImport/index";
import FormTemplate from "../FormTemplate/FormTemplate.vue";
import { getToken } from "@/util/auth";
-import codeApply from '@/mixins/codeApply.js'
+import codeApply from "@/mixins/codeApply.js";
export default {
name: "BatchImport",
mixins: [codeApply],
@@ -118,31 +128,37 @@
},
},
title() {
- return this.currentTypeObj[this.type]['title']
+ return this.currentTypeObj[this.type]["title"];
},
tipList() {
- return this.currentTypeObj[this.type]['tipList']
+ return this.currentTypeObj[this.type]["tipList"];
},
downloadTemplateApi() {
- return this.currentTypeObj[this.type]['downloadTemplateFun']
+ console.log(this.currentTypeObj[this.type], 'this.type');
+ return this.currentTypeObj[this.type]["downloadTemplateFun"];
},
action() {
- return this.currentTypeObj[this.type]['action']
+ return this.currentTypeObj[this.type]["action"];
},
upParams() {
- if (this.type === 'historyImport') {
+ if (this.type === "historyImport") {
return {
- codeClassifyOid: this.codeClassifyOid,
- classifyAttr: this.classifyAttr,
- }
- } else if(this.type === 'batchImportApply') {
+ codeClassifyOid: this.codeClassifyOid,
+ classifyAttr: this.classifyAttr,
+ };
+ } else if (this.type === "batchImportApply") {
return {
codeClassifyOid: this.codeClassifyOid,
secDTOList: this.secDTOList,
- ...this.codeApplyForm
- }
+ ...this.codeApplyForm,
+ };
+ } else if (this.type === "batchApplyCode") {
+ return {
+ codeClassifyOid: this.codeClassifyOid,
+ classifyAttr: this.classifyAttr,
+ };
}
- }
+ },
},
data() {
return {
@@ -163,7 +179,7 @@
],
action: "/api/ubcs-code/mdmEngineController/batchImportHistoryData",
downloadTemplateFun: downloadHistoryImportTemplate,
- upParams: 'classifyAttr'
+ upParams: "classifyAttr",
},
batchImportApply: {
title: "鎵归噺鐢宠缂栫爜",
@@ -175,26 +191,41 @@
],
action: "/api/ubcs-code/mdmEngineController/batchImportCode",
downloadTemplateFun: downloadBatchImportApplyTemplate,
- upParams: false
- }
+ upParams: "codeApply",
+ },
+ batchApplyCode: {
+ title: "鎵归噺鐢宠缂栫爜",
+ tipList: [
+ "1.鏍囬甯︿簲瑙掓槦鐨勮〃绀哄叧閿睘鎬э紝甯︽槦鍙疯〃绀哄繀杈撻」",
+ "2.鍒嗙被鐨勮矾寰勯渶瑕佺敤#鍒嗛殧銆備粠褰撳墠閫夋嫨鍒嗙被鑺傜偣鐨勪笅绾у紑濮嬪～鍐欙紝鐩村埌鏈�鏈熬鑺傜偣锛屽 浜у搧#涓绘満浜у搧#涓绘満浜у搧",
+ ],
+ action: "/api/ubcs-code/mdmEngineController/batchTopImportCode",
+ downloadTemplateFun: downloadBatchApplyCodeTemplate,
+ upParams: "classifyAttr",
+ },
},
};
},
methods: {
async beforeUpload(file) {
- console.log(223344);
const fileType = file.name.split(".").pop();
if (fileType !== "xlsx" && fileType !== "xls") {
// 涓婁紶鏍煎紡涓嶇鍚堣姹傦紝鎻愮ず閿欒淇℃伅骞跺彇娑堜笂浼�
this.$message.error("鍙厑璁镐笂浼爔lsx銆亁ls鏍煎紡鐨勬枃浠�");
- return Promise.reject(false)
+ return Promise.reject(false);
}
- if (this.type === 'batchImportApply') {
- const flag = await this.$refs.CodeApply.validate()
+ if (this.type === "batchImportApply") {
+ const flag = await this.$refs.CodeApply.validate();
if (!flag) {
- return Promise.reject(false)
+ return Promise.reject(false);
}
}
+ this.pageLoading = this.$loading({
+ lock: true,
+ text: "鏂囦欢涓婁紶涓�",
+ spinner: "el-icon-loading",
+ background: "rgba(0, 0, 0, 0.7)",
+ });
return true;
},
// 涓嬭浇瀵煎叆妯℃澘
@@ -233,21 +264,12 @@
}
},
uploadChange(file) {
- if (file.status === "uploadin") {
- this.pageLoading = this.$loading({
- lock: true,
- text: "鏂囦欢涓婁紶涓�",
- spinner: "el-icon-loading",
- background: "rgba(0, 0, 0, 0.7)",
- });
- }
if (file.status === "success" || file.status === "error") {
this.pageLoading.close();
}
},
},
- watch: {
- },
+ watch: {},
};
</script>
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index e9fd52a..fa8b390 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -8,9 +8,9 @@
<el-button plain size="small" type="primary" @click="editHandler"
>缂栬緫
</el-button>
- <el-button plain size="small" type="primary">鎵归噺瀵煎叆鐢宠</el-button>
- <el-button plain size="small" type="primary">鍘嗗彶鏁版嵁瀵煎叆</el-button>
- <el-button plain size="small" type="primary">鎵归噺鐢宠缂栫爜</el-button>
+ <el-button plain size="small" type="primary" @click="openBatchImport('batchImportApply')">鎵归噺瀵煎叆鐢宠</el-button>
+ <el-button plain size="small" type="primary" @click="openBatchImport('historyImport')">鍘嗗彶鏁版嵁瀵煎叆</el-button>
+ <el-button plain size="small" type="primary" @click="openBatchImport('batchApplyCode')">鎵归噺鐢宠缂栫爜</el-button>
<el-button plain size="small" type="primary">鎵归噺鍙戝竷</el-button>
<el-button plain size="small" type="primary">鏌ョ湅娴佺▼鍘嗗彶</el-button>
<el-button plain size="small" type="primary">鍒犻櫎</el-button>
@@ -144,6 +144,7 @@
>
</el-pagination>
</div>
+ <BatchImport v-if="batchImportData.visible" :visible.sync="batchImportData.visible" v-bind="batchImportData"></BatchImport>
</basic-container>
</template>
<script>
@@ -152,11 +153,13 @@
import integrationTransfer from "@/views/integration/integrationTransfer";
import SetPersonnel from "@/components/template/SetPersonnel";
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
+import BatchImport from '@/components/BatchImport'
export default {
components: {
integrationTransfer,
SetPersonnel,
ResembleQueryDialog,
+ BatchImport
},
name: "Crud.vue",
props: {
@@ -243,6 +246,11 @@
seniorQueryColumns: [],
selectRow: [],
userName: "",
+ batchImportData: {
+ visible: false,
+ type: '',
+ codeClassifyOid: ''
+ }
};
},
computed: {},
@@ -503,6 +511,11 @@
EditSumbit(val) {
this.editvisible = false;
},
+ openBatchImport(type) {
+ this.batchImportData.visible = true
+ this.batchImportData.type = type
+ this.batchImportData.codeClassifyOid = this.codeClassifyOid
+ }
},
};
</script>
diff --git a/Source/UBCS-WEB/src/mixins/codeApply.js b/Source/UBCS-WEB/src/mixins/codeApply.js
index 8b2f6dd..3f0c1be 100644
--- a/Source/UBCS-WEB/src/mixins/codeApply.js
+++ b/Source/UBCS-WEB/src/mixins/codeApply.js
@@ -41,7 +41,9 @@
}
},
created() {
- this.getCodeRule()
+ if (this.type === 'batchImportApply') {
+ this.getCodeRule()
+ }
},
methods: {
// 鑾峰彇鐮佸�肩敵璇锋暟鎹�
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 646c67d..07f5b89 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -27,8 +27,8 @@
'/api': {
// target: 'http://localhost:37000',
// target: 'http://localhost:37000',
- target: 'http://192.168.1.51:37000',
- // target: 'http://192.168.1.46:37000',
+ // target: 'http://192.168.1.51:37000',
+ target: 'http://192.168.1.46:37000',
// target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
// target: 'http://192.168.1.104:37000',
--
Gitblit v1.9.3