From c3eee25f39d69074a05899fc453fe4ea5a309e50 Mon Sep 17 00:00:00 2001 From: "DESKTOP-00SUCB6\\Administrator" Date: Thu, 30 Sep 2021 09:43:34 +0800 Subject: [PATCH] v2.0 0930 --- public/config.js | 2 +- src/utils/request.js | 2 +- src/utils/requestLoading.js | 2 +- src/views/get/cancel.vue | 33 ++++++++++++++++--- src/views/get/deliverGoods.vue | 34 +++++++++++++------- src/views/get/get.vue | 7 ++-- src/views/get/getDetail.vue | 2 +- src/views/get/returnReceipt.vue | 10 ++++-- src/views/send/cancel.vue | 2 +- src/views/status/goodsCount.vue | 8 +++-- src/views/status/sendStatus.vue | 48 +++++++++++++++------------- src/views/systemManage/user.vue | 4 +-- src/views/systemManage/whiteList.vue | 9 ++++-- 13 files changed, 108 insertions(+), 55 deletions(-) diff --git a/public/config.js b/public/config.js index 68d2615..bb4c63f 100644 --- a/public/config.js +++ b/public/config.js @@ -1,7 +1,7 @@ config = { // API_URL: 'http://fw.niulanshan.com.cn:8081', - API_URL: 'http://121.36.65.171:9999', + API_URL: 'http://121.36.65.171:9998', // API_URL: 'http://172.119.50.206:8081', } \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index a26c499..86554e3 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -64,7 +64,7 @@ service.interceptors.response.use( if (res.code === 209) { if (isToken) { isToken = false //防止下个一个token失效的请求在弹出第二个框 - MessageBox.alert('你已被登出，请重新登录', '确定登出', { + MessageBox.alert('登录超时，请重新登录', '确定登出', { confirmButtonText: '重新登录', type: 'warning', callback: () => { diff --git a/src/utils/requestLoading.js b/src/utils/requestLoading.js index 826224b..2ad5f4f 100644 --- a/src/utils/requestLoading.js +++ b/src/utils/requestLoading.js @@ -107,7 +107,7 @@ service.interceptors.response.use( if (res.code === 511) { if (isToken) { isToken = false //防止下个一个token失效的请求在弹出第二个框 - MessageBox.alert('你已被登出，请重新登录', '确定登出', { + MessageBox.alert('登录超时，请重新登录', '确定登出', { confirmButtonText: '重新登录', type: 'warning', callback: () => { diff --git a/src/views/get/cancel.vue b/src/views/get/cancel.vue index 9c36798..912edce 100644 --- a/src/views/get/cancel.vue +++ b/src/views/get/cancel.vue @@ -24,7 +24,7 @@ - + @@ -76,14 +76,17 @@ :headers="upload_headers" :with-credentials="true" :on-remove="handleRemove" + :before-upload="beforeAvatarUpload" :on-success="handleAvatarSuccess" - :before-remove="beforeRemove" :file-list="fileList" accept=".txt"> 点击上传 -
导入文件为TXT文本文件，且不超过50MB，防伪码请按一列进行录入。
+
导入文件为TXT文本文件，且不超过1MB，防伪码请按一列进行录入。
+ + +
保存 @@ -121,7 +124,8 @@ export default { discard_id:this.$route.query.ids || 'FMD_'+getDay2()+'_'+Math.floor(Math.random()*10000), discard_time:this.$route.query.times || getDayTime(), fetch_id:'', - filename:'' + filename:'', + summary:"" }, cancelRules: { fetch_id: [ @@ -153,12 +157,13 @@ export default { } getDiscardList(params).then(res => { this.tableData = res.data.list - this.total = res.data.count + this.total = res.data.total }) }, getQMDList(){ const params = { pageNo: 1, + status:2, pageSize: 1000, } getFetchList(params).then(res => { @@ -170,6 +175,10 @@ export default { this.getQMDList() // this.$router.push({name:'addCancel'}) }, + //点击列表一行查看详情 + clickRowShowDetail(row, column, event){ + this.showDetail(row.discardId) + }, //防伪码作废详情 showDetail(id) { this.$router.push({name:'getCancelDetail',query:{FMD_id:id}}) @@ -183,6 +192,7 @@ export default { discard_time:this.cancelForm.discard_time, fetch_id:this.cancelForm.fetch_id.join(','), filename:this.cancelForm.filename, + summary:this.cancelForm.summary || null, } addDiscard(params).then(res => { this.$message({ @@ -201,6 +211,7 @@ export default { //form重置 resetForm(formName) { this.dialogCancelVisible = false + this.fileList = [] this.$refs[formName].resetFields(); }, //每页条数变化 @@ -213,6 +224,18 @@ export default { this.currentPage = val this.initData() }, + beforeAvatarUpload(file) { + const isTXT = file.type === 'text/plain'; + const isLt1M = file.size / 1024 / 1024 < 1; + + if (!isTXT) { + this.$message.error('上传文件只能是 TXT 格式!'); + } + if (!isLt1M) { + this.$message.error('上传文件大小不能超过 1MB!'); + } + return isTXT && isLt1M; + }, handleAvatarSuccess(res, file) { this.cancelForm.filename = res.data }, diff --git a/src/views/get/deliverGoods.vue b/src/views/get/deliverGoods.vue index 4f59e92..9a7ab68 100644 --- a/src/views/get/deliverGoods.vue +++ b/src/views/get/deliverGoods.vue @@ -25,7 +25,7 @@ - + @@ -188,15 +188,27 @@ export default { } if(submitType) { - savecommit(params).then(res => { + this.$confirm('提交完成后不可删除，请确认信息准确性, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + savecommit(params).then(res => { + this.$message({ + message: res.msg, + type: res.code == 200 ? 'success' : 'error' + }); + this.$router.go(-1); + }).catch(err => { + console.log(err); + }) + }).catch(() => { this.$message({ - message: res.msg, - type: res.code == 200 ? 'success' : 'error' - }); - this.$router.go(-1); - }).catch(err => { - console.log(err); - }) + type: 'info', + message: '已取消操作' + }); + }); + } else { sentReceipt(params).then(res => { this.$message({ @@ -239,10 +251,10 @@ export default { const isLt2M = file.size / 1024 / 1024 < 2; if (!isJPG) { - this.$message.error('上传头像图片只能是 JPG/PNG 格式!'); + this.$message.error('上传图片只能是 JPG/PNG 格式!'); } if (!isLt2M) { - this.$message.error('上传头像图片大小不能超过 2MB!'); + this.$message.error('上传图片大小不能超过 2MB!'); } return isJPG && isLt2M; } diff --git a/src/views/get/get.vue b/src/views/get/get.vue index 351aeb6..12532b4 100644 --- a/src/views/get/get.vue +++ b/src/views/get/get.vue @@ -28,7 +28,7 @@ 印刷量：{{AllData.totalPrint}}

- + @@ -376,7 +376,8 @@ export default { }); }, //点击列表一行查看详情 - clickRowShowDetail(row, column, event){ + clickRowShowDetail(row, column, cell, event){ + if(cell.cellIndex == 4 || cell.cellIndex == 5) return this.showDetail(row.fetchId) }, //防伪取码详情 @@ -387,7 +388,7 @@ export default { addGetDialog(ids = null,times = null){ if( ids == null && times == null && this.isAddBtn == false) { - this.$alert('当前存在尚未生成取码文件的取码单，请生成取码文件后在创建新的取码单!', '提示', { + this.$alert('当前存在尚未生成取码文件的取码单，请生成取码文件后再创建新的取码单!', '提示', { confirmButtonText: '确定', callback: action => { } diff --git a/src/views/get/getDetail.vue b/src/views/get/getDetail.vue index fba8988..c9a1b30 100644 --- a/src/views/get/getDetail.vue +++ b/src/views/get/getDetail.vue @@ -103,7 +103,7 @@ export default { commitReceipt({id:row.id}).then(res => { this.$message({ type: 'success', - message: '删除成功!' + message: '提交成功!' }); this.initData() }).catch(err => { diff --git a/src/views/get/returnReceipt.vue b/src/views/get/returnReceipt.vue index 5b64baf..53a5ed1 100644 --- a/src/views/get/returnReceipt.vue +++ b/src/views/get/returnReceipt.vue @@ -21,7 +21,7 @@ - + @@ -78,19 +78,25 @@ export default { const params = { pageNo: this.currentPage, pageSize: this.pageSize, + status:2, discardId: this.formSearch.number|| null, startTime:this.formSearch.time?this.formSearch.time[0] : null, endTime:this.formSearch.time?this.formSearch.time[1] : null } getFetchList(params).then(res => { this.tableData = res.data.list - this.total = res.data.count + this.total = res.data.total }) }, //发货页面 deliverGoods(id,time,count){ this.$router.push({name:'deliverGoods',query:{id:id,time:time,count:count}}) }, + //点击列表一行查看详情 + clickRowShowDetail(row, column, cell, event){ + if(cell.cellIndex == 3) return + this.showDetail(row.fetchId) + }, //回执详情 showDetail(id) { this.$router.push({name:'returnReceiptDetail',query:{id:id}}) diff --git a/src/views/send/cancel.vue b/src/views/send/cancel.vue index a59a7ce..e6269d2 100644 --- a/src/views/send/cancel.vue +++ b/src/views/send/cancel.vue @@ -91,7 +91,7 @@ export default { } getDiscardList(params).then(res => { this.tableData = res.data.list - this.total = res.data.count + this.total = res.data.total }) }, confirm(id){ diff --git a/src/views/status/goodsCount.vue b/src/views/status/goodsCount.vue index fa020ff..418b318 100644 --- a/src/views/status/goodsCount.vue +++ b/src/views/status/goodsCount.vue @@ -25,7 +25,7 @@ 未印制量：{{AllData.totalUnPrint}}

- + @@ -91,7 +91,7 @@ export default { } printList(params).then(res => { this.tableData = res.data.list - this.total = res.data.count + this.total = res.data.total }) }, //查询总数 @@ -100,6 +100,10 @@ export default { this.AllData = res.data }) }, + //点击列表一行查看详情 + clickRowShowDetail(row, column, event){ + this.showDetail(row.fetchId) + }, //取码废详情 showDetail(id) { this.$router.push({name:'getGoodsDetail',query:{id:id}}) diff --git a/src/views/status/sendStatus.vue b/src/views/status/sendStatus.vue index e4f5285..33512db 100644 --- a/src/views/status/sendStatus.vue +++ b/src/views/status/sendStatus.vue @@ -34,7 +34,7 @@
- + @@ -42,7 +42,7 @@ @@ -141,8 +141,10 @@ export default { } }) }, - //防伪码作废详情 - + //点击列表一行查看详情 + clickRowShowDetail(row, column, event){ + this.showGetDetail() + }, // 查看取码详情 showGetDetail(id){ this.$router.push({name:'getAllDetail'}) @@ -208,7 +210,7 @@ export default { }, tooltip: { trigger: 'item', - formatter: '{a}
{b} : {c}', + formatter: '{b} : {c}', backgroundColor: 'rgba(0,0,0,0.6)', borderColor: 'rgba(0,0,0,0)', padding: 10, @@ -271,14 +273,14 @@ export default { formatter: '{b} : {c}', position: 'top', }, - emphasis: { - label: { - formatter: '', - show: true, - fontSize: '40', - fontWeight: 'bold', - }, - }, + // emphasis: { + // label: { + // formatter: '', + // show: true, + // fontSize: '40', + // fontWeight: 'bold', + // }, + // }, data: politicsFenBu_data, }, ], @@ -337,7 +339,7 @@ export default { }, tooltip: { trigger: 'item', - formatter: '{a}
{b} : {c}元', + formatter: '{b} : {c}', backgroundColor: 'rgba(0,0,0,0.6)', borderColor: 'rgba(0,0,0,0)', padding: 10, @@ -389,6 +391,8 @@ export default { borderWidth: 2, //设置border的宽度有多大 borderColor: 'rgba(0,0,0,0.2)', }, + // minAngle:3, + minShowLabelAngle:0.01, smooth: true, center: ['62%', '50%'], name: '', @@ -400,14 +404,14 @@ export default { formatter: '{b} : {c}', position: 'top', }, - emphasis: { - label: { - formatter: '', - show: true, - fontSize: '40', - fontWeight: 'bold', - }, - }, + // emphasis: { + // label: { + // formatter: '', + // show: true, + // fontSize: '40', + // fontWeight: 'bold', + // }, + // }, data: politicsFenBu_data, }, ], diff --git a/src/views/systemManage/user.vue b/src/views/systemManage/user.vue index d54d20e..6cf8bb9 100644 --- a/src/views/systemManage/user.vue +++ b/src/views/systemManage/user.vue @@ -7,7 +7,7 @@ - +