From 4bcf7f5cbc8185b10e773feda6bee90fe3f32137 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 22 七月 2022 15:50:21 +0800
Subject: [PATCH] 1.文件上传校验导入实现一个demo2.修改bug
---
src/utils/request.js | 26 ++--
src/views/zzmx/chda.vue | 2
src/views/zlgl/gxjy.vue | 10 +
src/views/jcsz/yhqd.vue | 12 ++
src/views/jcsz/jsqd.vue | 45 +++++---
src/components/ImportPicker/index.vue | 132 ++++++++++++++------------
src/api/Excel.js | 21 ++++
src/views/zzmx/gxdy.vue | 4
8 files changed, 155 insertions(+), 97 deletions(-)
diff --git a/src/api/Excel.js b/src/api/Excel.js
index bacdaf2..53e6af9 100644
--- a/src/api/Excel.js
+++ b/src/api/Excel.js
@@ -8,11 +8,30 @@
params: data
})
}
+
// Excel瀵煎叆鏂囦欢涓婁紶銆佹ā鏉块獙璇併�佹暟鎹噺銆侀獙璇�
export function ExcelModelCheck(data) {
return request({
url: 'ImportExcel/ExcelModelCheck',
- method: 'get',
+ method: 'post',
+ params: data
+ })
+}
+
+// Excel瀵煎叆鏁版嵁楠岃瘉
+export function ExcelCheckData(data) {
+ return request({
+ url: 'ImportExcel/ExcelCheckData',
+ method: 'post',
+ params: data
+ })
+}
+
+// Excel瀵煎叆鏁版嵁
+export function ExcelImportSubmit(data) {
+ return request({
+ url: 'ImportExcel/ExcelImportSubmit',
+ method: 'POST',
params: data
})
}
diff --git a/src/components/ImportPicker/index.vue b/src/components/ImportPicker/index.vue
index c85c1b3..186af18 100644
--- a/src/components/ImportPicker/index.vue
+++ b/src/components/ImportPicker/index.vue
@@ -3,6 +3,7 @@
:visible.sync="visible"
:title="title"
:code="code"
+ :close-on-click-modal="false"
@close="$emit('update:shows', false)"
>
<div>
@@ -19,13 +20,13 @@
<p>2. 璇峰嬁璋冩暣瀵煎叆妯＄増涓瓧娈电殑宸﹀彸椤哄簭鎴栨柊澧瀞heet椤�</p>
</div>
- <div v-if="div2 && div2_state === "300"">
+ <div v-if="div2 && div2_state === '301'">
<p><span class="gth_icon">!</span>鏂囦欢涓湁<span style="color:red">{{ error_list.length }}</span>鏉￠敊璇暟鎹紝璇蜂慨鏀瑰悗閲嶆柊瀵煎叆</p>
<el-table class="table" :data="error_list" :header-cell-style="{background:'#f5f5f5'}">
- <el-table-column label="搴忓彿" prop="Seq" />
- <el-table-column label="琛屽彿" prop="RoeNumber" />
- <el-table-column label="閿欒瀛楁" prop="ErrorField" />
- <el-table-column label="閿欒璇︽儏" prop="ErrorCont" />
+ <el-table-column label="搴忓彿" prop="Seq" width="50" />
+ <!-- <el-table-column label="琛屽彿" prop="RoeNumber" />-->
+ <el-table-column label="閿欒瀛楁" prop="ErrorField" min-width="150" />
+ <el-table-column label="閿欒璇︽儏" prop="ErrorCont" min-width="300" />
</el-table>
</div>
<div v-if="div2 && div2_state === '200'" style="position:relative;margin-top:100px;">
@@ -38,7 +39,7 @@
<h3>涓婁紶鏂囦欢</h3>
<el-upload
style="display: inline-block;"
- action="/apis/importexcel/ExcelModelCheck"
+ :action="baseUrl==='/api/'?'/api/importexcel/ExcelModelCheck':'/apis/importexcel/ExcelModelCheck'"
:show-file-list="false"
:on-success="handleAvatarSuccess"
:before-upload="beforeUpload"
@@ -56,8 +57,10 @@
<li>
<div class="progress_bar bar-color-a" />
<div :class="{'progress_bar':true, 'bar-color-b':true,'position_div':true,'cg':cg1,'sb':sb1}" />
- <div v-if="json1 === 200" class="mt"><img src="@/assets/images/succ.png" class="img_position">鏂囦欢涓婁紶 (鎴愬姛)</div>
- <div v-if="json1 === 300" class="mt"><img src="@/assets/images/sbbbb_icon.png" class="img_position">鏂囦欢涓婁紶 (澶辫触)</div>
+ <!-- <div v-if="json1 === '200'" class="mt"><img src="@/assets/images/succ.png" class="img_position">鏂囦欢涓婁紶 (鎴愬姛)</div>-->
+ <div v-if="json1 === '200'" class="mt"><img src="@/assets/images/succ.png" class="img_position">{{ message1 }}</div>
+ <!-- <div v-if="json1 === '300'" class="mt"><img src="@/assets/images/sbbbb_icon.png" class="img_position">鏂囦欢涓婁紶 (澶辫触)</div>-->
+ <div v-if="json1 === '300'" class="mt"><img src="@/assets/images/sbbbb_icon.png" class="img_position">{{ message1 }}</div>
<div v-if="json1=== null" class="mt">鏂囦欢涓婁紶锛堝緟鏍￠獙锛�</div>
</li>
<!-- <li >
@@ -69,8 +72,8 @@
<li>
<div class="progress_bar bar-color-a" />
<div :class="{'progress_bar':true, 'bar-color-b':true,'position_div':true,'cg':cg2,'sb':sb2}" />
- <div v-if="json2 === 200" class="mt"><img src="@/assets/images/succ.png" class="img_position">妯＄増鏍￠獙 (鎴愬姛)</div>
- <div v-if="json2 === 300" class="mt"><img src="@/assets/images/sbbbb_icon.png" class="img_position">妯＄増鏍￠獙 (澶辫触)</div>
+ <div v-if="json2 === '200'" class="mt"><img src="@/assets/images/succ.png" class="img_position">{{ message2 }}</div>
+ <div v-if="json2 === '300'" class="mt"><img src="@/assets/images/sbbbb_icon.png" class="img_position">{{ message2 }}</div>
<div v-if="json2 === null" class="mt">妯＄増鏍￠獙锛堝緟鏍￠獙锛�</div>
</li>
<!-- <li v-if="json2 === 300">
@@ -87,8 +90,8 @@
<li>
<div class="progress_bar bar-color-a" />
<div :class="{'progress_bar':true, 'bar-color-b':true,'position_div':true,'cg':cg3,'sb':sb3}" />
- <div v-if="json3 === 200" class="mt"><img src="@/assets/images/succ.png" class="img_position">鏁版嵁閲忔牎楠� (鎴愬姛)</div>
- <div v-if="json3 === 300" class="mt"><img src="@/assets/images/sbbbb_icon.png" class="img_position">鏁版嵁閲忔牎楠� (澶辫触)</div>
+ <div v-if="json3 === '200'" class="mt"><img src="@/assets/images/succ.png" class="img_position">{{ message3 }}</div>
+ <div v-if="json3 === '300'" class="mt"><img src="@/assets/images/sbbbb_icon.png" class="img_position">{{ message3 }}</div>
<div v-if="json3 === null" class="mt">鏁版嵁閲忔牎楠岋紙寰呮牎楠岋級</div>
</li>
<!-- <li v-if="json3 === 300">
@@ -125,7 +128,7 @@
</template>
<script>
-import { DownLoadExcel, ExcelModelCheck } from '@/api/Excel'
+import { DownLoadExcel, ExcelCheckData, ExcelImportSubmit, ExcelModelCheck } from '@/api/Excel'
export default {
props: {
@@ -160,6 +163,10 @@
},
data() {
return {
+ message1: '',
+ message2: '',
+ message3: '',
+ getDataing: false,
cg1: false,
sb1: false,
cg2: false,
@@ -188,7 +195,8 @@
json3: '',
mnList: [],
error_list: [],
- button_text: '涓嬩竴姝�'
+ button_text: '涓嬩竴姝�',
+ baseUrl: ''
}
},
@@ -196,6 +204,9 @@
shows() {
this.visible = this.shows
}
+ },
+ mounted() {
+ this.baseUrl = process.env.VUE_APP_BASE_API
},
methods: {
newDataFunc() {
@@ -218,6 +229,7 @@
FileCode: code,
FileName: this.file_name
}
+
if (this.num === 0) {
this.div1 = false
this.div2 = true
@@ -232,40 +244,31 @@
}
},
ExcelImportSubmit(data) {
- // all.ExcelImportSubmit(data).then((res) => {
- // if (res.statusCode === '200') {
- // this.div3 = true
- // this.num += 2
- // this.button_text = '瀹屾垚'
- // this.disState = false
- // } else {
- // this.num += 1
- // this.div3_sb = true
- // this.disState = true
- // this.error_message = res.message
- // }
- // })
+ ExcelImportSubmit(data).then((res) => {
+ if (res.code === '200') {
+ this.div3 = true
+ this.num += 2
+ this.button_text = '瀹屾垚'
+ this.disState = false
+ } else {
+ this.num += 1
+ this.div3_sb = true
+ this.disState = true
+ this.error_message = res.Message
+ }
+ })
},
ExcelCheckData(data) {
- // all.ExcelCheckData(data).then((res) => {
- // this.div2_state = res.StuCode
- // setTimeout(() => {
- // this.cg4 = true
- // }, 2000)
- // this.error_list = res.list
- // this.total_num = res.Count
- // if (res.StuCode === '200') {
- // this.disState = false
- // }
- // })
- ExcelModelCheck(data).then(res => {
- this.div2_state = res.StuCode
+ ExcelCheckData(data).then((res) => {
+ this.div2_state = res.code
setTimeout(() => {
this.cg4 = true
}, 2000)
+
this.error_list = res.list
+
this.total_num = res.Count
- if (res.StuCode === '200') {
+ if (res.code === '200') {
this.disState = false
}
})
@@ -287,7 +290,7 @@
this.cg3 = false
this.sb3 = false
setTimeout(() => {
- if (res.json1.statusCode === 200) {
+ if (res.json1.code === '200') {
this.cg1 = true
} else {
this.sb1 = true
@@ -297,10 +300,11 @@
}
}, 500)
setTimeout(() => {
- this.json1 = res.json1.statusCode
+ this.json1 = res.json1.code
+ this.message1 = res.json1.Message
this.json2 = null
this.json3 = null
- if (res.json2.statusCode === 200) {
+ if (res.json2.code === '200') {
this.cg2 = true
} else {
this.sb2 = true
@@ -309,35 +313,41 @@
}
}, 2000)
setTimeout(() => {
- this.json2 = res.json2.statusCode
+ this.json2 = res.json2.code
+ this.message2 = res.json2.Message
this.json3 = null
- if (res.json3.statusCode === 200) {
- this.cg3 = true
- } else {
- this.sb3 = true
- this.json3 = null
- this.button_name = '鏇存柊鏂囦欢'
+ if (res.json3 !== null) {
+ if (res.json3.code === '200') {
+ this.cg3 = true
+ } else {
+ this.sb3 = true
+ this.json3 = null
+ this.button_name = '鏇存柊鏂囦欢'
+ }
}
}, 4000)
setTimeout(() => {
- this.json3 = res.json3.statusCode
+ if (res.json3 !== null) {
+ this.json3 = res.json3.code
+ this.message3 = res.json3.Message
+ }
}, 6000)
- // if(res.json1.statusCode === 300){
+ // if(res.json1.code === 300){
// this.json2 = null
// this.json3 =null
// this.button_name = '鏇存柊鏂囦欢'
// }else{
- // this.json2 = res.json2.statusCode
+ // this.json2 = res.json2.code
// }
- // if(res.json2.statusCode === 300){
+ // if(res.json2.code === 300){
// this.json3 =null
// this.button_name = '鏇存柊鏂囦欢'
// }else{
- // this.json3 = res.json3.statusCode
+ // this.json3 = res.json3.code
// }
setTimeout(() => {
- if (this.json1 === 200 && this.json2 === 200 && this.json3 === 200) {
+ if (this.json1 === '200' && this.json2 === '200' && this.json3 === '200') {
this.disState = false
}
}, 7000)
@@ -350,10 +360,10 @@
// window.location.href = res
// })
DownLoadExcel(data).then(res => {
- console.log(res.data)
- console.log(process.env.VUE_APP_BASE_API)
- console.log(process.env.VUE_APP_BASE_API_FILE)
- console.log(window.location.origin + res.data)
+ // console.log(res.data)
+ // console.log(process.env.VUE_APP_BASE_API, 8989899)
+ // console.log(process.env.VUE_APP_BASE_API_FILE)
+ // console.log(window.location.origin + res.data)
window.location.href = process.env.VUE_APP_BASE_API_FILE + res.data
})
}
diff --git a/src/utils/request.js b/src/utils/request.js
index 061a8ee..0417379 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -51,7 +51,7 @@
const res = response.data
// if the custom code is not 20000, it is judged as an error.
- if (res.code !== '200') {
+ if (res.code === '300') {
Message({
message: res.Message || 'Error',
type: 'error',
@@ -59,18 +59,18 @@
})
// 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
- if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
- // to re-login
- MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
- confirmButtonText: 'Re-Login',
- cancelButtonText: 'Cancel',
- type: 'warning'
- }).then(() => {
- store.dispatch('user/resetToken').then(() => {
- location.reload()
- })
- })
- }
+ // if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
+ // // to re-login
+ // MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
+ // confirmButtonText: 'Re-Login',
+ // cancelButtonText: 'Cancel',
+ // type: 'warning'
+ // }).then(() => {
+ // store.dispatch('user/resetToken').then(() => {
+ // location.reload()
+ // })
+ // })
+ // }
return Promise.reject(new Error(res.message || 'Error'))
} else {
return res
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index ecc2490..5bcb437 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -47,7 +47,7 @@
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
- <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+ <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
</div>
<el-divider />
<div class="elTableDiv">
@@ -117,7 +117,7 @@
>
<template slot-scope="{row}">
<i v-if="row.is_user==='Y'" class="el-icon-user-solid" @click="userClick(row)" />
- <i v-if="row.is_user==='N'" class="el-icon-user-solid" style="color: #E4E7ED" @click="userClick(row)" />
+ <i v-if="row.is_user==='N'" class="el-icon-user-solid" style="color: rgb(180 ,181, 185)" @click="userClick(row)" />
</template>
</el-table-column>
<el-table-column
@@ -128,7 +128,7 @@
>
<template slot-scope="{row}">
<i v-if="row.is_right==='Y'" class="el-icon-share" @click="rightClick(row)" />
- <i v-if="row.is_right==='N'" class="el-icon-share" style="color: #E4E7ED" @click="rightClick(row)" />
+ <i v-if="row.is_right==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="rightClick(row)" />
</template>
</el-table-column>
<el-table-column
@@ -504,11 +504,16 @@
</div>
</span>
</el-dialog>
+
+ <!--瀵煎叆缁勪欢-->
+ <import-picker ref="importPickerFunc" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
+import ImportPicker from '@/components/ImportPicker'
import {
AddUpdateRole,
DeleteRole, RoleAssociationRight,
@@ -524,7 +529,7 @@
export default {
name: 'JSQD',
components: {
- Pagination
+ Pagination, ImportPicker
},
data() {
const validateName = (rule, value, callback) => {
@@ -538,13 +543,6 @@
}
}
}
- // const validateTypeCode = (rule, value, callback) => {
- // if (!value) {
- // return callback(new Error('璇烽�夋嫨涓婄骇'))
- // } else {
- // callback()
- // }
- // }
return {
isFullscreen: false,
mainHeight: 0,
@@ -642,7 +640,18 @@
value: 'code'
},
PCTrue: false, // 鏄惁灞曠ず
- APPTrue: false// 鏄惁灞曠ず
+ APPTrue: false, // 鏄惁灞曠ず
+
+ title_value: '鏁版嵁瀵煎叆 / 瑙掕壊娓呭崟',
+ code: '1',
+ shows: false
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getRoleSearch()
+ }
}
},
created() {
@@ -707,10 +716,6 @@
this.formSetting.order = order
this.formSetting.prop = prop
this.getRoleTypeSearch()
- },
-
- upload() {
-
},
// 鏌ヨ
search() {
@@ -1430,6 +1435,14 @@
this.dialogFormRight.rightAPPArrSelected = ['APP']
}
}
+ },
+ // 瀵煎叆鎸夐挳
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
}
}
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index ee8c740..966c620 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -189,7 +189,7 @@
>
<template slot-scope="{row}">
<i v-if="row.is_role==='Y'" class="el-icon-share" @click="roleClick({row})" />
- <i v-if="row.is_role==='N'" class="el-icon-share" style="color: #E4E7ED" @click="roleClick({row})" />
+ <i v-if="row.is_role==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="roleClick({row})" />
</template>
</el-table-column>
<el-table-column
@@ -653,11 +653,19 @@
prop: 'group_code',
order: 'desc'
},
+
title_value: '鏁版嵁瀵煎叆 / 鐢ㄦ埛娓呭崟',
- code: '1',
+ code: '2',
shows: false
}
},
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getUserSearch()
+ }
+ }
+ },
created() {
this.getUserSearch()
this.getUserOrganization()
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index bcab59c..a62f8b9 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -294,7 +294,8 @@
JYSelectedArr: [], // 宸查�夋楠岄」鐩暟缁�
multipleSelection: [], // 琛ㄦ牸澶氶�夋
tabClickIndex: null, // 鐐瑰嚮鐨勫崟鍏冩牸
- tabClickLabel: '' // 褰撳墠鐐瑰嚮鐨勫垪鍚�
+ tabClickLabel: '', // 褰撳墠鐐瑰嚮鐨勫垪鍚�
+ isCancel: false// 鏄惁鐐瑰嚮鍙栨秷鎸夐挳
}
},
created() {
@@ -332,6 +333,7 @@
},
// 妫�楠屾爣鍑嗕笅鎷夊�兼敼鍙�
async changeCheckStandard(val) {
+ this.isCancel = false
this.JYSelectedArr = []
const { data: res } = await MesOrderStepCheckItemList({ checkstandcode: val })
this.JYTableData = res
@@ -371,6 +373,9 @@
this.checkResult = 'OK'
} else {
this.checkResult = 'NG'
+ }
+ if (this.isCancel) {
+ this.checkResult = ''
}
},
// 妫�楠岄」鐩紪鐮侊紙鍚嶇О锛�
@@ -525,6 +530,7 @@
clearContent() {
this.JYTableData = []
this.multipleSelection = []
+ this.JYSelectedArr = []
this.checkdescr = ''
this.checkUser = ''
this.checkResult = ''
@@ -536,6 +542,8 @@
this.form.partspec = ''
this.form.stepcode = ''
this.form.stepname = ''
+
+ this.isCancel = true
},
// 鍗曞厓鏍艰鐐瑰嚮鏃�
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index b8fe8a1..17aedb5 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -197,7 +197,7 @@
<template slot-scope="{row}">
<div class="operationClass">
<i v-if="row.proute_id==='Y'" class="el-icon-share" @click="routeClick(row)" />
- <i v-if="row.proute_id==='N'" style="color: #E4E7ED" class="el-icon-share" @click="routeClick(row)" />
+ <i v-if="row.proute_id==='N'" style="color:rgb(180 ,181, 185)" class="el-icon-share" @click="routeClick(row)" />
</div>
</template>
</el-table-column>
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index fc5e496..7ab483b 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -147,7 +147,7 @@
<template slot-scope="{row}">
<div class="operationClass">
<i v-if="row.is_eqp==='Y'" class="el-icon-share" @click="workClick(row)" />
- <i v-if="row.is_eqp==='N'" class="el-icon-share" style="color: #E4E7ED" @click="workClick(row)" />
+ <i v-if="row.is_eqp==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="workClick(row)" />
</div>
</template>
</el-table-column>
@@ -159,7 +159,7 @@
<template slot-scope="{row}">
<div class="operationClass">
<i v-if="row.is_defect==='Y'" class="el-icon-share" @click="defectClick(row)" />
- <i v-if="row.is_defect==='N'" class="el-icon-share" style="color: #E4E7ED;" @click="defectClick(row)" />
+ <i v-if="row.is_defect==='N'" class="el-icon-share" style="color:rgb(180 ,181, 185);" @click="defectClick(row)" />
</div>
</template>
</el-table-column>
--
Gitblit v1.9.3