product_platform/yxt-yyth-ui-admin
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2023-12-28

Browse Source
This commit is contained in:
guoxing
2023-12-28 15:51:11 +08:00
parent 8993547ebc
commit 641047a551
7 changed files with 132 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@@ -8,7 +8,7 @@ VUE_APP_BASE_API = '/api'
# VUE_APP_URL = "http://jianguan.yyundong.com/shgfapi" # VUE_APP_URL = "http://jianguan.yyundong.com/shgfapi"
VUE_APP_URL = "http://192.168.2.103:7201" VUE_APP_URL = "http://192.168.2.105:7201"
VUE_APP_REPORT_URL = "http://192.168.2.106:7202" VUE_APP_REPORT_URL = "http://192.168.2.106:7202"
##VUE_APP_REPORT_URL = "https://lpk.yyundong.com" ##VUE_APP_REPORT_URL = "https://lpk.yyundong.com"
##VUE_APP_REPORT_URL = "https://supervise.yxtsoft.com/lpk" ##VUE_APP_REPORT_URL = "https://supervise.yxtsoft.com/lpk"

1
src/components/uploadFile/upload_yanchejianchaTuBiao.vue
View File

@@ -145,6 +145,7 @@
imgFiles.push(o.url) imgFiles.push(o.url)
}) })
this.$emit('fileChange', this.files) this.$emit('fileChange', this.files)
this.$emit('change', this.files)
}, },
handleRemove(file, fileList) { handleRemove(file, fileList) {
console.log('file:' + JSON.stringify(file)) console.log('file:' + JSON.stringify(file))

43
src/views/commodity/commodityAdd.vue
View File

@@ -47,7 +47,8 @@
<div class="item" style="margin-bottom: 100px;margin-top: 100px;"> <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
<span class="item_text">图片：</span> <span class="item_text">图片：</span>
<upload style="margin-top: 20px;" class="item_input" ref="uploadImg2" v-model="imgList" :limit="1" <upload style="margin-top: 20px;" class="item_input" ref="uploadImg2" v-model="imgList" :limit="1"
@change="backData" bucket="map" :upload-data="{ type: '0001' }"></upload> @change="backData" bucket="map" :class="{ hide: hideUploadBtn }"
:upload-data="{ type: '0001' }"></upload>
</div> </div>
<div> <div>
@@ -89,7 +90,8 @@
remarks: "", remarks: "",
picUrl: "", picUrl: "",
appContent: '' appContent: ''
} },
hideUploadBtn: false,
} }
}, },
methods: { methods: {
@@ -97,8 +99,14 @@
console.log("backData》》》》", value) console.log("backData》》》》", value)
console.log("imgList", this.imgList) console.log("imgList", this.imgList)
if (this.imgList.length > 0) {
this.formobj.picUrl = this.imgList[0].url
} else {
this.formobj.picUrl = ""
}
this.formobj.picUrl = this.imgList[0].url this.hideUploadBtn = this.imgList.length != 0;
console.log("this.hideUploadBtn", this.hideUploadBtn)
}, },
saveOrUpdate() { saveOrUpdate() {
@@ -143,18 +151,25 @@
if (resp.success) { if (resp.success) {
this.formobj = resp.data this.formobj = resp.data
this.imgList = [] this.imgList = []
this.imgList.push({ if (resp.data.picUrl != '')
url: resp.data.picUrl this.imgList.push({
}) url: resp.data.picUrl
})
this.hideUploadBtn = this.imgList.length != 0;
console.log("this.hideUploadBtn", this.hideUploadBtn)
} }
}) })
.catch(e => { .catch(e => {
this.formobj = row this.formobj = row
this.imgList = [] this.imgList = []
this.imgList.push({ if (resp.data.picUrl != '')
url: formobj.picUrl this.imgList.push({
}) url: formobj.picUrl
})
this.hideUploadBtn = this.imgList.length != 0;
console.log("this.hideUploadBtn", this.hideUploadBtn)
}) })
}, },
editinput(text) { editinput(text) {
@@ -163,7 +178,15 @@
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
// 隐藏上传组件
::v-deep .hide {
.el-upload--picture-card {
display: none !important;
}
}
.box-card { .box-card {
margin-left: 60px; margin-left: 60px;
margin-right: 60px; margin-right: 60px;

37
src/views/marketingCard/corporateCardSet.vue
View File

@@ -31,7 +31,7 @@
<el-table :data="tableData" border style="width: 100%; margin-top: 20px;" <el-table :data="tableData" border style="width: 100%; margin-top: 20px;"
:row-style="{height: '40px'}"> :row-style="{height: '40px'}">
<el-table-column label="序号" width="70px" type="index" align="center"> <el-table-column label="序号" width="70px" type="index" :index="indexMethod" align="center">
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150px" align="center"> <el-table-column label="操作" width="150px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -53,7 +53,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="bagName" label="绑定礼包" align="center"> <el-table-column prop="bagName" label="绑定礼包" align="center">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="bagName" label="发放数量" align="center"> <!-- <el-table-column prop="bagName" label="发放数量" align="center">
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
@@ -98,7 +98,7 @@
<el-table :data="tableData2" border style="width: 100%; margin-top: 20px;" <el-table :data="tableData2" border style="width: 100%; margin-top: 20px;"
:row-style="{height: '40px'}"> :row-style="{height: '40px'}">
<el-table-column label="序号" width="70px" type="index" align="center"> <el-table-column label="序号" width="70px" type="index" :index="indexMethod2" align="center">
</el-table-column> </el-table-column>
<!-- <el-table-column label="操作" width="150px" align="center"> <!-- <el-table-column label="操作" width="150px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -157,7 +157,7 @@
style="width: 100%;display: flex;flex-direction: row;justify-content: center;margin-top: 20px;"> style="width: 100%;display: flex;flex-direction: row;justify-content: center;margin-top: 20px;">
<span <span
style="background: #018AD2; color: #fff;padding: 5px 15px;border-radius: 5px;font-size: 16px;" style="background: #018AD2; color: #fff;padding: 5px 15px;border-radius: 5px;font-size: 16px;"
@click="saveOrUpdate">发行</span> @click="saveOrUpdate" >发行</span>
</div> </div>
@@ -242,13 +242,15 @@
}, },
giftPackList: [], giftPackList: [],
stateList: [{ stateList: [{
name: "全部", name: "全部",
sid: "" sid: ""
}, { }, {
name: "未绑定用户", name: "未绑定",
sid: "2" sid: "1"
} }, {
], name: "已绑定用户",
sid: "2"
}],
recordId: '', recordId: '',
editDialog: false, editDialog: false,
from: { from: {
@@ -264,7 +266,18 @@
this.getBankList() this.getBankList()
}, },
methods: { methods: {
// 序号
indexMethod(index) {
var pagestart = (this.page.current - 1) * this.page.size
var pageindex = index + 1 + pagestart
return pageindex
},
// 序号
indexMethod2(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
handleClick(tab, event) { handleClick(tab, event) {
this.viewState = 1 this.viewState = 1

69
src/views/marketingCard/indexAdd.vue
View File

@@ -116,7 +116,7 @@
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<upload style="margin-top: 20px;margin-bottom: 20px;" class="addinputw" ref="uploadImg2" <upload style="margin-top: 20px;margin-bottom: 20px;" class="addinputw" ref="uploadImg2"
v-model="imgList" :limit="1" @change="backData" bucket="map" v-model="imgList" :limit="1" @change="backData" bucket="map"
:upload-data="{ type: '0001' }"></upload> :upload-data="{ type: '0001' }" :class="{ hide: hideUploadBtn }"></upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -151,7 +151,7 @@
</div> </div>
<el-dialog title="添加商品" :visible.sync="editDialog" width="30%"> <el-dialog title="添加商品" :visible.sync="editDialog" width="30%" @close='handleCancle'>
<table class="e-table" cellspacing="0"> <table class="e-table" cellspacing="0">
<tr> <tr>
<td>商品名称</td> <td>商品名称</td>
@@ -187,7 +187,7 @@
</table> </table>
<div style="margin-top: 20px; text-align: center;"> <div style="margin-top: 20px; text-align: center;">
<el-button type="primary" @click="save()">保 存</el-button> <el-button type="primary" @click="save()">保 存</el-button>
<el-button @click="editDialog = false">关 闭</el-button> <el-button @click="handleCancle">关 闭</el-button>
</div> </div>
</el-dialog> </el-dialog>
@@ -230,7 +230,8 @@
price: "", price: "",
}, },
goods: [] goods: [],
hideUploadBtn: false,
} }
}, },
created() { created() {
@@ -246,7 +247,7 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
const index = this.formobj.goods.findIndex((item) => item.goodsSid === sid) const index = this.formobj.goods.findIndex((item) => item.goodsSid === sid)
console.log("index》》》》", index) console.log("index》》》》", index)
this.formobj.goods.splice(index, 1) this.formobj.goods.splice(index, 1)
}) })
}, },
@@ -296,6 +297,17 @@
} }
},
handleCancle(){
this.GiftBagGood = {
goodsSid: "",
goodsNumber: "",
name: "",
unitName: "",
price: "",
}
this.editDialog = false
}, },
input(val) { input(val) {
console.log("input》》》》", val) console.log("input》》》》", val)
@@ -330,7 +342,15 @@
console.log("backData》》》》", value) console.log("backData》》》》", value)
console.log("imgList", this.imgList) console.log("imgList", this.imgList)
this.formobj.iconUrl = this.imgList[0].url
if (this.imgList.length > 0) {
this.formobj.iconUrl = this.imgList[0].url
} else {
this.formobj.iconUrl = ""
}
this.hideUploadBtn = this.imgList.length != 0;
console.log("this.hideUploadBtn", this.hideUploadBtn)
}, },
saveOrUpdate() { saveOrUpdate() {
@@ -347,12 +367,12 @@
}) })
this.handleReturn('true') this.handleReturn('true')
} else { } else {
this.submitdisabled = false this.submitdisabled = false
// 根据resp.code进行异常情况处理 // 根据resp.code进行异常情况处理
} }
}) })
.catch(() => { .catch(() => {
this.submitdisabled = false this.submitdisabled = false
}) })
}, },
handleReturn(isreload) { handleReturn(isreload) {
@@ -381,24 +401,37 @@
if (resp.success) { if (resp.success) {
this.formobj = resp.data this.formobj = resp.data
this.imgList = [] this.imgList = []
this.imgList.push({ if (resp.data.iconUrl != '')
url: resp.data.iconUrl this.imgList.push({
}) url: resp.data.iconUrl
})
this.hideUploadBtn = this.imgList.length != 0;
console.log("this.hideUploadBtn", this.hideUploadBtn)
} }
}) })
.catch(e => { .catch(e => {
this.formobj = row this.formobj = row
this.imgList = [] this.imgList = []
this.imgList.push({ if (resp.data.iconUrl != '')
url: formobj.iconUrl this.imgList.push({
}) url: formobj.iconUrl
})
this.hideUploadBtn = this.imgList.length != 0;
console.log("this.hideUploadBtn", this.hideUploadBtn)
}) })
} }
} }
} }
</script> </script>
<style scoped> <style lang="scss" scoped>
// 隐藏上传组件
::v-deep .hide {
.el-upload--picture-card {
display: none !important;
}
}
.trightb { .trightb {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -416,7 +449,7 @@
font-weight: 400; font-weight: 400;
} }
/deep/.el-collapse-item__header { ::v-deep .el-collapse-item__header {
height: 40px; height: 40px;
padding: 10px; padding: 10px;
font-weight: bold; font-weight: bold;
@@ -426,7 +459,7 @@
background-color: #0294d7; background-color: #0294d7;
} }
/deep/.el-collapse-item__content { ::v-deep .el-collapse-item__content {
padding-bottom: 0; padding-bottom: 0;
} }
</style> </style>

23
src/views/marketingCard/pickupCardSet.vue
View File

@@ -31,13 +31,13 @@
<el-table :data="tableData" border style="width: 100%; margin-top: 20px;" <el-table :data="tableData" border style="width: 100%; margin-top: 20px;"
:row-style="{height: '40px'}"> :row-style="{height: '40px'}">
<el-table-column label="序号" width="70px" type="index" align="center"> <el-table-column label="序号" width="70px" type="index" :index="indexMethod" align="center">
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150px" align="center"> <el-table-column label="操作" width="150px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="editRow(scope.row)"> <!-- <el-button type="primary" size="mini" @click="editRow(scope.row)">
发放 发放
</el-button> </el-button> -->
<el-button type="primary" size="mini" @click="showRow(scope.row.sid)"> <el-button type="primary" size="mini" @click="showRow(scope.row.sid)">
明细 明细
</el-button> </el-button>
@@ -98,7 +98,7 @@
<el-table :data="tableData2" border style="width: 100%; margin-top: 20px;" <el-table :data="tableData2" border style="width: 100%; margin-top: 20px;"
:row-style="{height: '40px'}"> :row-style="{height: '40px'}">
<el-table-column label="序号" width="70px" type="index" align="center"> <el-table-column label="序号" width="70px" type="index" :index="indexMethod2" align="center">
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150px" align="center"> <el-table-column label="操作" width="150px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -321,6 +321,9 @@
stateList: [{ stateList: [{
name: "全部", name: "全部",
sid: "" sid: ""
}, {
name: "未发放",
sid: "1"
}, { }, {
name: "未绑定用户", name: "未绑定用户",
sid: "2" sid: "2"
@@ -360,6 +363,18 @@
this.getBankList() this.getBankList()
}, },
methods: { methods: {
// 序号
indexMethod(index) {
var pagestart = (this.page.current - 1) * this.page.size
var pageindex = index + 1 + pagestart
return pageindex
},
// 序号
indexMethod2(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//下载模版 //下载模版
handleDownload() { handleDownload() {

2
src/views/order/index.vue
View File

@@ -68,7 +68,7 @@
<el-table-column prop="reserveDate" label="预约日期" align="center" /> <el-table-column prop="reserveDate" label="预约日期" align="center" />
<el-table-column prop="bankName" label="所属支行" align="center" /> <el-table-column prop="bankName" label="所属支行" align="center" />
<el-table-column prop="store" label="提货地点" align="center" /> <el-table-column prop="store" label="提货地点" align="center" />
<el-table-column prop="code" label="提货序列号" align="center" /> <el-table-column prop="serialNumber" label="卡券序列号" align="center" />
<el-table-column prop="bagName" label="礼包类型" align="center" /> <el-table-column prop="bagName" label="礼包类型" align="center" />
<el-table-column prop="userName" label="用户名称" align="center" /> <el-table-column prop="userName" label="用户名称" align="center" />
<el-table-column prop="userPhone" label="联系电话" align="center" /> <el-table-column prop="userPhone" label="联系电话" align="center" />