Skip to content

I
integral-mall
Commit 350cbb75 by damodmg
Options

更新

parent 7191ad8a
Showing with 73 additions and 12 deletions
dist/index.html
......@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');</script><link href=./static/css/app.9c76b984a834d863220d5dd04892ca87.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.cec66d0f213d2ca57aa9.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=./static/css/app.f6e79ad9fa44d1fbe0f31c2eb4bb2a36.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.8dbc2c41aae53b1e0fb5.js></script></body></html>
\ No newline at end of file
dist/static/css/app.9c76b984a834d863220d5dd04892ca87.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.f6e79ad9fa44d1fbe0f31c2eb4bb2a36.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.8dbc2c41aae53b1e0fb5.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.cec66d0f213d2ca57aa9.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/store/store.vue
......@@ -20,15 +20,28 @@
</el-upload>
<el-button type="text" class="download-btn" @click="downLoad">点击下载模板</el-button>
</div>
<div class="upload-text" v-if="uploadNum > 0">
本次成功上传
<span class="file-num">{{ uploadNum }}</span
>个自提点
<span class="file-name">{{ uploadFileName }}</span>
<el-button type="text" icon="iconfont icon-xiazai" @click="downLoadFile"></el-button>
<div class="upload-text" v-if="uploadNum + errorNum > 0">
<div v-if="isAdd">
本次共上传 {{ uploadNum + errorNum }} 个自提点，其中成功 <span class="file-num">{{ uploadNum }}</span
>个，失败 <span class="error-num"> {{ errorNum }} </span>个。
<el-button type="text" class="error-list" @click="dialogVisible = true" v-if="errorNum > 0">查看失败原因</el-button>
</div>
<div v-else>本次共成功上传 {{ uploadNum }} 个自提点</div>
<div class="file-name">
<span>{{ uploadFileName }}</span>
<el-button type="text" icon="iconfont icon-xiazai" @click="downLoadFile"></el-button>
</div>
</div>
</div>
</div>
<el-dialog title="导入失败原因" :visible.sync="dialogVisible" width="420px">
<div class="info-content" style="height:400px;overflow-y:auto">
<div v-for="(item, index) in errorList" :key="index" class="list-content">
<span class="reason-info">{{ item.orderNumber }}</span>
<span class="sku-info">{{ item.errorMessage }}</span>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -50,6 +63,12 @@ export default {
default() {
return [];
}
},
isAdd: {
type: Boolean,
default() {
return true;
}
}
},
data() {
......@@ -61,10 +80,13 @@ export default {
},
showList: false,
uploadNum: 0,
errorNum: 0,
uploadFileName: '',
downloadUrl: '',
pickUpPointStr: '',
storeType: 0
storeType: 0,
dialogVisible: false,
errorList: []
};
},
mounted() {
......@@ -101,6 +123,8 @@ export default {
if (file.errorCode === 0) {
this.uploadFileName = file.result.picUploadResDTO.fileId;
this.uploadNum = file.result.orderErrorDTO.correctNumber;
this.errorNum = file.result.orderErrorDTO.errornumber;
this.errorList = file.result.orderErrorDTO.list || [];
this.downloadUrl = file.result.picUploadResDTO.url;
this.pickUpPointStr = file.result.pickUpPointStr;
let obj = {};
......@@ -110,6 +134,7 @@ export default {
pickUpPointStr: this.pickUpPointStr,
correctNumber: this.uploadNum
};
this.$emit('getArr', obj, this.storeType);
} else {
this.$message.error(file.message);
......@@ -168,8 +193,21 @@ export default {
font-weight: 600;
margin: 0 5px;
}
.error-num {
color: #ff5152;
}
.error-list {
margin-left: 10px;
}
.file-name {
margin-left: 20px;
width: 220px;
height: 37px;
line-height: 37px;
padding: 0 10px;
background: #f2f3f7;
margin-top: 10px;
display: flex;
justify-content: space-between;
}
.right-content /deep/ .upload-btn {
width: 240px;
......@@ -187,4 +225,24 @@ export default {
.upload-content {
width: 240px;
}
.sku-info {
font-size: 13px;
color: #606266;
margin-left: 10px;
vertical-align: top;
width: 280px;
display: inline-block;
word-break: break-all;
}
.reason-info {
color: #303133;
font-size: 14px;
font-weight: 500;
word-break: break-all;
width: 80px;
display: inline-block;
}
.list-content {
margin-bottom: 15px;
}
</style>
src/views/goods/gift/info.vue
......@@ -218,7 +218,7 @@
</el-form-item>
<el-form-item label="自提点" v-if="giftForm.changeTypeList.indexOf('4') != -1">
<template>
<pickUp-store :pickUpPointType="pickUpPointType" :selectData="selectedStoreData" @getArr="getArr"></pickUp-store>
<pickUp-store :isAdd="isAddPick" :pickUpPointType="pickUpPointType" :selectData="selectedStoreData" @getArr="getArr"></pickUp-store>
</template>
</el-form-item>
<!-- <el-form-item label="自提点" v-if="giftForm.changeTypeList.indexOf('4') != -1">
......@@ -495,7 +495,8 @@ export default {
// 门店自提数据
pickUpPointType: 0,
selectedStoreData: [],
pickUpPointStr: ''
pickUpPointStr: '',
isAddPick: true
};
},
// watch: {
......@@ -545,9 +546,11 @@ export default {
// }, 1000);
// this.getDisGroupList();
this.getInfo();
this.isAddPick = false;
// this.getDisGroupList();
this.editChangeTypeStatus = true;
} else {
this.isAddPick = true;
if (this.giftType === 0) {
this.getGiftId();
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment