Skip to content

R
rs-cloud-platform-ui
Commit c8dc167b authored by lixy's avatar lixy
Browse files
Options

Merge branch 'dev'

parents 66e6ff8c 3d11dfbd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 780 additions and 487 deletions
src/api/website/order/index.js
View file @ c8dc167b
......@@ -46,3 +46,46 @@ export function createOrder(obj) {
});
}
/**
* 添加定制数据
*/
export function setOrderItem(obj) {
return fetch({
url: '/api/website/orderInfo/setOrderItem',
method: 'post',
data: obj
});
}
/**
* 选择定制数据
*/
export function getItemByType(obj) {
return fetch({
url: '/api/website/orderInfo/getItemByType',
method: 'get',
params: obj
});
}
/**
* 对公支付审核
*/
export function updatePayStatus(obj) {
return fetch({
url: '/api/website/orderInfo/updatePayStatus',
method: 'post',
data: obj
});
}
/**
* 对公支付信息
*/
export function getCompanyInfoByType(query) {
return fetch({
url: 'api/website/commonInfo/web/app/unauth/getByType',
method: 'get',
params: query
});
}
src/utils/dateUtils.js
View file @ c8dc167b
......@@ -38,6 +38,10 @@ export function convertDate2Str(object) {
export function timestamp2Date(timestamp) {
let str = timestamp + ''
if( str.length == 10){
timestamp = timestamp * 1000
}
const date = new Date(timestamp); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
}
......
src/views/orderManagement/orderList/orderSendDetail.vue
View file @ c8dc167b
<template>
<el-dialog title="订单详情" :visible.sync="isVisible"></el-dialog>
<el-dialog title="发货详情" :visible.sync="isVisible" class="send-main">
<div class="invoice-item" v-if="oneRow.orderEInvoice && oneRow.invoiceStatus >= 3">
<div class="flex-aic-jcb">
<div class="invoice-item-text"><label>{{ oneRow.orderEInvoice.titleType == 1 ? "公司名称" : "个人名称" }}：{{ oneRow.orderEInvoice.titleName }}</label> </div>
<div
style="
color: #0a84ff;
font-size: 12px;
background: #d9eafa;
border-radius: 2px;
padding: 2px 5px;
">
{{ oneRow.orderEInvoice.type == 1 ? "普通发票" : "增值税专用发票" }}-{{
oneRow.orderEInvoice.titleType == 1 ? "企业" : "个人" }}
</div>
</div>
<div class="invoice-item-text" v-if="oneRow.orderEInvoice.titleType == 1 && oneRow.orderEInvoice.type == 2" ><label>地址：{{ oneRow.orderEInvoice.province }}{{ oneRow.orderEInvoice.city }}{{ oneRow.orderEInvoice.town}}{{ oneRow.orderEInvoice.address }}</label> </div>
<div class="invoice-item-text" v-if="oneRow.orderEInvoice.titleType == 1 && oneRow.orderEInvoice.type == 2"> <label>电话：{{ oneRow.orderEInvoice.phone }}</label> </div>
<div class="invoice-item-text" v-if="oneRow.orderEInvoice.titleType == 1 && oneRow.orderEInvoice.type == 2"> <label>开户行：{{ oneRow.orderEInvoice.openBank }}</label></div>
<div class="invoice-item-text" v-if="oneRow.orderEInvoice.titleType == 1 && oneRow.orderEInvoice.type == 2"><label>账号：{{ oneRow.orderEInvoice.account }}</label></div>
<div class="flex-aic-jcb">
<span class="invoice-item-text" v-if="oneRow.orderEInvoice.titleType == 1"><label>税号：{{ oneRow.orderEInvoice.taxCode }}</label></span>
</div>
<el-form label-width="80px" style="margin-top: 20px;">
<el-row>
<el-form-item label="快递公司">
<el-input style="width:300px" v-model="oneRow.orderEInvoice.trackingImg" placeholder="请输入快递公司" :maxlength="40" disabled></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="快递单号">
<el-input style="width:300px" v-model="oneRow.orderEInvoice.trackingNumber" placeholder="请输入快递单号" :maxlength="40" disabled></el-input>
</el-form-item>
</el-row>
</el-form>
</div>
<div class="send-info" v-if="oneRow.shippingStatus == 2">
<div class="flex-aic-jcb">
<label>联系人：{{oneRow.receiveName}}</label>
<label style="border:1px solid #409EFF;color: #409EFF;font-size: 12px;padding: 2px 6px;border-radius:4px;">个人信息</label>
</div>
<div style="margin: 10px 0;"><label>手机号：{{oneRow.receivePhone}}</label></div>
<div><label>地址：{{oneRow.receiveAddress}}</label></div>
<el-form label-width="80px" style="margin-top: 20px;">
<el-row>
<el-form-item label="快递公司">
<el-input style="width:300px" v-model="oneRow.trackingImg" placeholder="请输入快递公司" :maxlength="40" disabled></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="快递单号">
<el-input style="width:300px" v-model="oneRow.trackingNumber" placeholder="请输入快递单号" :maxlength="40" disabled></el-input>
</el-form-item>
</el-row>
</el-form>
</div>
</el-dialog>
</template>
<script type="javascript">
export default {
......@@ -35,3 +91,20 @@
}
}
</script>
<style lang="scss">
.send-main{
.send-info{
border: 1px solid #eee;
padding: 20px;
margin-bottom: 20px;
margin-top: 20px;
}
.invoice-item{
padding: 20px;
border: 1px solid #eee;
.invoice-item-text{
margin-top: 10px;
}
}
}
</style>
src/views/orderManagement/orderList/selectDataDialog.vue 0 → 100644
View file @ c8dc167b
<template>
<el-dialog title="选择数据" :visible.sync="isVisible" width="600px" class="data-main">
<!-- <el-button type="primary" @click="jumpUrl()">新 增</el-button>-->
<div class="flex-aic" v-for="(iitem, index) in list" style="position:relative;margin-bottom: 10px;">
<el-input v-model="iitem.name" placeholder="请输入关键字" style="width: 60%;margin-right:10px;"></el-input>
<div class="ab-main" v-if="iitem.showTab">
<p v-for="item in iitem.dataList" @click="chooseItem(iitem, item)">{{item.name}}</p>
<p v-if="iitem.dataList.length<=0" @click="chooseItem(iitem)">无匹配内容</p>
</div>
<el-button type="primary" @click="handleChoose(iitem)" slot="reference">搜索</el-button>
<el-button type="primary" v-if="index == list.length - 1" @click="handleAdd()" style="margin-left: 10px;">+</el-button>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" v-if="!isClick" @click="okSend()">提 交</el-button>
<el-button type="primary" v-else style="opacity: 0.6;" disabled>提 交</el-button>
</div>
</el-dialog>
</template>
<script type="javascript">
import { getItemByType, setOrderItem } from 'api/website/order/index'
export default {
props: ['oneRow'],
name: 'selectDataDialog',
data() {
return {
isClick: false, // 是否点击了发货
loading: false,
list: [{id: 1, dataList: [], name: ''}], // 已选数组
isVisible: false,
}
},
watch: {
isVisible(newValue, oldValue) {
if (!newValue) {
this.$emit('selectDataEvent', false)
}
}
},
mounted() {
this.isVisible = true
},
methods: {
/**
* 新增
*/
handleAdd(){
this.list.push({id: this.list.length+1, dataList: [], name: ''})
},
/**
* 选择数据
*/
chooseItem(iitem, item){
if(item){
iitem.checkedObj = item
iitem.name = item.name
} else {
iitem.checkedObj = undefined
iitem.name = ''
}
iitem.showTab = false
this.$forceUpdate()
},
/**
* 搜索
*/
handleChoose(row){
this.list.map(function(item){
item.showTab = false;
})
this.getList(row)
},
/**
* 弹框-取消
* */
cancel() {
this.$emit('selectDataEvent', false)
},
/**
* 选择数据列表
*/
getList(row) {
let _this = this
getItemByType({type: this.oneRow.type, name: row.name}).then((response) => {
if(response.status == 200){
row.dataList = response.data
row.showTab = true
_this.$forceUpdate()
} else {
this.$notify({
title: '失败',
message: response.message,
type: 'error',
duration: 2000
})
}
});
},
/**
* 新增-跳转界面
*/
jumpUrl(){
if(this.oneRow.type == 1){
// 标准数据新增
} else if(this.oneRow.type == 2){
// 行业应用
this.$router.push({path:'/industryApplication/applicationList'})
} else if(this.oneRow.type == 3){
// 影像图库
this.$router.push({path:'/webSiteManagement/imageLibrary'})
}
},
/**
* 确定
*/
okSend() {
let _this = this
if(this.isClick){
return
}
this.isClick = true
setTimeout(function(){
_this.isClick = false
}, 2000)
let itemInfoDtoList = []
this.list.map(function(item){
if(item.checkedObj){
let p = {
id: item.checkedObj.id,
type: item.checkedObj.type // 类型 1、标准数据，2、影像图库，3、行业应用信息,
}
itemInfoDtoList.push(p)
}
})
if(itemInfoDtoList.length<=0){
this.$message.warning("请选择数据")
return;
}
let params = {
orderId: this.oneRow.orderId,
itemInfoDtoList: itemInfoDtoList
}
setOrderItem(params).then((response) => {
if(response.status == 200){
this.$notify({
title: "成功",
message: "操作成功",
type: "success",
duration: 2000
});
this.$emit('selectDataEvent', true)
} else {
this.$notify({
title: '失败',
message: response.message,
type: 'error',
duration: 2000
})
}
});
}
}
}
</script>
<style lang="scss">
.data-main{
.el-dialog{
height: calc(100vh - 260px);
min-height:300px;
}
.el-dialog .el-dialog__body{
overflow: auto;
height: calc(100vh - 400px);
min-height: 150px;
}
.ab-main{
position: absolute;
top: 45px;
padding: 0 20px;
border-radius: 4px;
width: 60%;
max-height: 200px;
overflow: auto;
background: rgb(255, 255, 255);
border: 1px solid rgb(244, 244, 244);
z-index: 9;
box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
p{
cursor: pointer;
padding-bottom: 10px;
border-bottom: 1px solid #f4f4f4;
}
p:last-child{
border-bottom: none;
}
}
.ab-main::-webkit-scrollbar, .el-dialog__body::-webkit-scrollbar{width: 0px;}
}
</style>
src/views/orderManagement/orderList/send.vue
View file @ c8dc167b
<template>
<el-dialog :title="title" :visible.sync="isVisible" width="600px" class="send-main">
<div class="invoice-item">
<div class="invoice-item" v-if="oneRow.orderEInvoice && title=='发票发货'">
<div class="flex-aic-jcb">
<div class="invoice-item-text"><label>{{ oneRow.orderEInvoice.titleType == 1 ? "公司名称" : "个人名称" }}：{{ oneRow.orderEInvoice.titleName }}</label> </div>
<div
......@@ -162,9 +162,6 @@
.invoice-item-text{
margin-top: 10px;
}
.invoice-item-text:first-child{
margin-top: 0;
}
}
}
</style>
src/views/userManagement/index.vue
View file @ c8dc167b
......@@ -19,7 +19,7 @@
<el-form-item label="用户ID">
<el-input v-model="listQuery.userId" placeholder="请输入用户ID"></el-input>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item label="注册时间">
<el-date-picker
v-model="times"
type="datetimerange"
......@@ -58,7 +58,7 @@
<!-- <img style="width: 40px;height: 40px;border-radius: 50%;" :src="scope.row.headimgurl" @click.stop="showPreview(scope.row.headimgurl)"/>-->
</template>
</el-table-column>
<el-table-column align="center" label="创建时间">
<el-table-column align="center" label="注册时间">
<template slot-scope="scope">
{{scope.row.crtTimeStr}}
</template>
......
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