Skip to content

J
jz_electricity
Commit 58072edc authored by zhengke's avatar zhengke
Browse files
Options

修改

parent c47f19c9
Show whitespace changes
Inline Side-by-side
Showing with 723 additions and 875 deletions
src/components/UserMan/usersList.vue
View file @ 58072edc
......@@ -3,174 +3,85 @@
<div class="head-title">
用户管理
<el-button
@click="dialogVisible = true"
style="float: right; margin-top: -5px"
size="small"
type="primary"
>批量导出
<el-button @click="dialogVisible = true" style="float: right; margin-top: -5px" size="small" type="primary">批量导出
</el-button>
<el-button
@click="addusers"
style="float: right; margin-top: -5px; margin-right: 10px"
size="small"
type="primary"
>新增
<el-button @click="addusers" style="float: right; margin-top: -5px; margin-right: 10px" size="small"
type="primary">新增
</el-button>
</div>
<div class="content">
<div>
<el-select
class="w100"
@change="(msg.pageIndex = 1), getList()"
style="margin-right: 10px"
v-model="msg.MemberGrade"
size="small"
placeholder="请选择"
>
<el-select class="w100" @change="(msg.pageIndex = 1), getList()" style="margin-right: 10px"
v-model="msg.MemberGrade" size="small" placeholder="请选择">
<el-option label="全部会员" :value="0"></el-option>
<el-option
v-for="item in memberGradeList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
>
<el-option v-for="item in memberGradeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
<el-select
class="w100"
@change="(msg.pageIndex = 1), getList()"
style="margin-right: 10px"
v-model="msg.Source"
size="small"
placeholder="请选择"
>
<el-select class="w100" @change="(msg.pageIndex = 1), getList()" style="margin-right: 10px" v-model="msg.Source"
size="small" placeholder="请选择">
<el-option label="全部平台" :value="0"></el-option>
<el-option
v-for="item in platList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
>
<el-option v-for="item in platList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
<div class="searchInput" style="width: 150px">
<el-input
@keyup.enter.native="(msg.pageIndex = 1), getList()"
@clear="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 125px; height: 30px"
placeholder="请输入ID"
v-model="msg.Id"
size="small"
clearable
>
<el-input @keyup.enter.native="(msg.pageIndex = 1), getList()" @clear="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 125px; height: 30px" placeholder="请输入ID" v-model="msg.Id" size="small"
clearable>
</el-input>
<span
@click="(msg.pageIndex = 1), getList()"
class="el-icon-search"
style="
<span @click="(msg.pageIndex = 1), getList()" class="el-icon-search" style="
color: #979dad;
font-size: 14px;
position: relative;
top: 1px;
"
></span>
"></span>
</div>
<div class="searchInput" style="width: 150px">
<el-input
@keyup.enter.native="(msg.pageIndex = 1), getList()"
@clear="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 125px; height: 30px"
placeholder="请输入昵称"
v-model="msg.Name"
size="small"
clearable
>
<el-input @keyup.enter.native="(msg.pageIndex = 1), getList()" @clear="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 125px; height: 30px" placeholder="请输入昵称" v-model="msg.Name"
size="small" clearable>
</el-input>
<span
@click="(msg.pageIndex = 1), getList()"
class="el-icon-search"
style="
<span @click="(msg.pageIndex = 1), getList()" class="el-icon-search" style="
color: #979dad;
font-size: 14px;
position: relative;
top: 1px;
"
></span>
"></span>
</div>
<div class="searchInput" style="width: 150px">
<el-input
@keyup.enter.native="(msg.pageIndex = 1), getList()"
@clear="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 125px; height: 30px"
placeholder="请输入手机号"
v-model="msg.Moblie"
size="small"
clearable
>
<el-input @keyup.enter.native="(msg.pageIndex = 1), getList()" @clear="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 125px; height: 30px" placeholder="请输入手机号" v-model="msg.Moblie"
size="small" clearable>
</el-input>
<span
@click="(msg.pageIndex = 1), getList()"
class="el-icon-search"
style="
<span @click="(msg.pageIndex = 1), getList()" class="el-icon-search" style="
color: #979dad;
font-size: 14px;
position: relative;
top: 1px;
"
></span>
"></span>
</div>
<el-date-picker
v-model="dateList"
@change="(msg.pageIndex = 1), getList()"
size="small"
type="datetimerange"
range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
<el-date-picker v-model="dateList" @change="(msg.pageIndex = 1), getList()" size="small" type="datetimerange"
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</div>
<el-table
:data="tableData"
v-loading="loading"
border
style="width: 100%; margin: 20px 0"
>
<el-table :data="tableData" v-loading="loading" border style="width: 100%; margin: 20px 0">
<el-table-column prop="Id" label="ID" width="100"> </el-table-column>
<el-table-column prop="address" width="280" label="头像">
<template slot-scope="scope">
<div
class="app-image"
:style="{
<div class="app-image" :style="{
backgroundImage: 'url(' + scope.row.Photo + ')',
backgroundSize: 'cover',
}"
></div>
}"></div>
<div flex="dir:left cross:center">
{{ scope.row.Name }}
<span
v-if="scope.row.AliasName && scope.row.AliasName != ''"
class="remark_name"
>备注名：{{ scope.row.AliasName }}</span
>
<span v-if="scope.row.AliasName && scope.row.AliasName != ''"
class="remark_name">备注名：{{ scope.row.AliasName }}</span>
</div>
<img
v-if="scope.row.Source == 1"
style="width: 24px; height: 24px"
src="../../assets/img/userman/wx.png"
alt=""
class="platform-img"
/>
<button
type="button"
class="el-button el-button--success"
style="float: right; padding: 5px !important"
>
<span @click="ChangeOpenidState(scope.$index, scope.row)"
>显示OpenId</span
>
<img v-if="scope.row.Source == 1" style="width: 24px; height: 24px" src="../../assets/img/userman/wx.png"
alt="" class="platform-img" />
<img v-if="scope.row.Source == 2" style="width: 30px; height: 30px"
src="../../assets/img/userman/alipay.png" alt="" class="platform-img" />
<button type="button" class="el-button el-button--success" style="float: right; padding: 5px !important">
<span @click="ChangeOpenidState(scope.$index, scope.row)">显示OpenId</span>
</button>
<div v-show="scope.row.OpenIdState">{{ scope.row.OpenId }}</div>
</template>
......@@ -178,48 +89,28 @@
<el-table-column prop="PostName" label="职位"> </el-table-column>
<el-table-column label="会员类型">
<template slot-scope="scope">
<span
>{{ scope.row.MemberGradeName }}
<span>{{ scope.row.MemberGradeName }}
<span>
<el-tag
v-if="scope.row.UserPageTypeStr == '全部'"
size="mini"
>{{ scope.row.UserPageTypeStr }}</el-tag
>
<el-tag
v-if="scope.row.UserPageTypeStr == '商城'"
type="success"
size="mini"
>{{ scope.row.UserPageTypeStr }}</el-tag
>
<el-tag
v-if="scope.row.UserPageTypeStr == '校园'"
type="danger"
size="mini"
>{{ scope.row.UserPageTypeStr }}</el-tag
>
<el-tag v-if="scope.row.UserPageTypeStr == '全部'" size="mini">{{ scope.row.UserPageTypeStr }}</el-tag>
<el-tag v-if="scope.row.UserPageTypeStr == '商城'" type="success" size="mini">
{{ scope.row.UserPageTypeStr }}</el-tag>
<el-tag v-if="scope.row.UserPageTypeStr == '校园'" type="danger" size="mini">
{{ scope.row.UserPageTypeStr }}</el-tag>
</span>
</span>
</template>
</el-table-column>
<el-table-column prop="name" label="订单数">
<template slot-scope="scope">
<span
@click="
<span @click="
CommonJump('orderList', { TypeId: 4, UserId: scope.row.Id })
"
class="blue point"
>{{ scope.row.OrderNum }}</span
>
" class="blue point">{{ scope.row.OrderNum }}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="优惠券数量">
<template slot-scope="scope">
<span
@click="CommonJump('usersCoupon', { UserId: scope.row.Id })"
class="blue point"
>{{ scope.row.CouponsNum }}</span
>
<span @click="CommonJump('usersCoupon', { UserId: scope.row.Id })"
class="blue point">{{ scope.row.CouponsNum }}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="卡券数量">
......@@ -236,136 +127,62 @@
</el-table-column>
<el-table-column prop="name" label="积分">
<template slot-scope="scope">
<span
@click="CommonJump('IntegralRecord', { UserId: scope.row.Id })"
class="blue point"
>{{ scope.row.Integral }}</span
>
<span @click="CommonJump('IntegralRecord', { UserId: scope.row.Id })"
class="blue point">{{ scope.row.Integral }}</span>
</template>
</el-table-column>
<el-table-column prop="CreateDate" width="150" label="加入时间">
</el-table-column>
<el-table-column prop="address" width="200" label="操作">
<template slot-scope="scope">
<el-tooltip
class="item"
effect="dark"
content="编辑"
placement="top"
>
<img
@click="EditgoUrl(scope.row)"
style="width: 32px; height: 32px"
src="../../assets/img/userman/edit.png"
alt=""
/>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="EditgoUrl(scope.row)" style="width: 32px; height: 32px"
src="../../assets/img/userman/edit.png" alt="" />
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="充值积分"
placement="top"
>
<img
@click="OpenczjfDig(scope.row, 1)"
style="width: 32px; height: 32px; margin: 0 10px"
src="../../assets/img/userman/integral.png"
alt=""
/>
<el-tooltip class="item" effect="dark" content="充值积分" placement="top">
<img @click="OpenczjfDig(scope.row, 1)" style="width: 32px; height: 32px; margin: 0 10px"
src="../../assets/img/userman/integral.png" alt="" />
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="充值余额"
placement="top"
>
<img
@click="OpenczjfDig(scope.row, 2)"
style="width: 32px; height: 32px"
src="../../assets/img/userman/balance.png"
alt=""
/>
<el-tooltip class="item" effect="dark" content="充值余额" placement="top">
<img @click="OpenczjfDig(scope.row, 2)" style="width: 32px; height: 32px"
src="../../assets/img/userman/balance.png" alt="" />
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="二维码"
placement="top"
>
<img
@click="showQRcode(scope.row)"
style="width: 32px; height: 32px"
src="../../assets/img/userman/QRcode.png"
alt=""
/>
<el-tooltip class="item" effect="dark" content="二维码" placement="top">
<img @click="showQRcode(scope.row)" style="width: 32px; height: 32px"
src="../../assets/img/userman/QRcode.png" alt="" />
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="查看详情"
placement="top"
>
<img
@click="showDetail(scope.row)"
style="width: 32px; height: 32px"
src="../../assets/img/userman/icon-show.png"
alt=""
/>
<el-tooltip class="item" effect="dark" content="查看详情" placement="top">
<img @click="showDetail(scope.row)" style="width: 32px; height: 32px"
src="../../assets/img/userman/icon-show.png" alt="" />
</el-tooltip>
</template>
</el-table-column>
</el-table>
<el-pagination
style="text-align: right"
background
@current-change="handleCurrentChange"
:page-size="msg.pageSize"
:current-page.sync="msg.pageIndex"
layout="total,prev, pager, next"
:total="total"
>
<el-pagination style="text-align: right" background @current-change="handleCurrentChange"
:page-size="msg.pageSize" :current-page.sync="msg.pageIndex" layout="total,prev, pager, next" :total="total">
</el-pagination>
</div>
<!-- 选择导出信息 -->
<el-dialog title="选择导出信息" :visible.sync="dialogVisible" width="960px">
<el-form
style="border: 1px solid #f0f2f7"
:model="addMsg"
ref="addMsg"
label-width="100px"
>
<div
style="
<el-form style="border: 1px solid #f0f2f7" :model="addMsg" ref="addMsg" label-width="100px">
<div style="
box-sizing: border-box;
background-color: #f3f5f6;
width: 100%;
padding-left: 20px;
height: 50px;
line-height: 50px;
"
>
<el-checkbox
:indeterminate="isIndeterminate"
v-model="checkAll"
@change="handleCheckAllChange"
>全选
">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选
</el-checkbox>
</div>
<div style="margin: 15px 0"></div>
<div style="padding: 10px 25px 20px">
<el-checkbox-group
v-model="checkedCities"
@change="handleCheckedCitiesChange"
>
<el-checkbox
style="margin-bottom: 10px; width: 135px"
v-for="city in cities"
:label="city.Id"
:key="city.Name"
>
{{ city.Name }}</el-checkbox
>
<el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
<el-checkbox style="margin-bottom: 10px; width: 135px" v-for="city in cities" :label="city.Id"
:key="city.Name">
{{ city.Name }}</el-checkbox>
</el-checkbox-group>
</div>
</el-form>
......@@ -385,34 +202,16 @@
<el-radio v-model="addMsg.Type" :label="2">扣除</el-radio>
</el-form-item>
<el-form-item v-if="czType == 1" label="积分数" prop="Integral">
<el-input
@keyup.native="checkInteger(addMsg, 'Integral')"
size="small"
v-model="addMsg.Integral"
></el-input>
<el-input @keyup.native="checkInteger(addMsg, 'Integral')" size="small" v-model="addMsg.Integral"></el-input>
</el-form-item>
<el-form-item v-if="czType == 2" label="充值金额" prop="Balance">
<el-input
@keyup.native="checkInteger(addMsg, 'Balance')"
size="small"
v-model="addMsg.Balance"
></el-input>
<el-input @keyup.native="checkInteger(addMsg, 'Balance')" size="small" v-model="addMsg.Balance"></el-input>
</el-form-item>
<el-form-item label="充值图片">
<el-button @click="openChangeDig" size="small">选择文件</el-button>
<div>
<img
v-if="imgurl == ''"
style="width: 80px; height: 80px"
src="../../assets/img/default.png"
alt=""
/>
<img
v-else
style="width: 80px; height: 80px"
:src="imgurl"
alt=""
/>
<img v-if="imgurl == ''" style="width: 80px; height: 80px" src="../../assets/img/default.png" alt="" />
<img v-else style="width: 80px; height: 80px" :src="imgurl" alt="" />
</div>
</el-form-item>
<el-form-item label="备注">
......@@ -421,18 +220,13 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="czjfDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="czsubmitForm('addMsg')"
>确 定</el-button
>
<el-button size="small" type="primary" @click="czsubmitForm('addMsg')">确 定</el-button>
</span>
</el-dialog>
<!-- 充值积分 -->
<el-dialog title="二维码" :visible.sync="qrshow" width="600px">
<div style="display: flex; align-items: center; justify-content: center">
<el-image
style="width: 200px; height: 200px"
:src="qrcodeImg"
></el-image>
<el-image style="width: 200px; height: 200px" :src="qrcodeImg"></el-image>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="qrshow = false">关 闭</el-button>
......@@ -448,9 +242,9 @@
</div>
</template>
<script>
import ChooseImg from "@/components/global/ChooseImg.vue";
import detail from "./components/seeDetail";
export default {
import ChooseImg from "@/components/global/ChooseImg.vue";
import detail from "./components/seeDetail";
export default {
components: {
ChooseImg,
detail,
......@@ -486,20 +280,16 @@ export default {
platList: [],
memberGradeList: [],
rules: {
Type: [
{
Type: [{
required: true,
message: "请选择类型",
trigger: "change",
},
],
Integral: [
{
}, ],
Integral: [{
required: true,
message: "请输入积分",
trigger: "blur",
},
],
}, ],
},
addMsg: {
MallBaseId: 0,
......@@ -515,7 +305,7 @@ export default {
qrshow: false,
//查看详情
detailData: {},
detailShow:false,
detailShow: false,
};
},
created() {
......@@ -592,8 +382,10 @@ export default {
},
showQRcode(row) {
this.apipost(
"/api/user/GetWeiXinQRCodeForHT",
{ Path: "/pages/index/index?user_id=" + row.Id, With: 212 },
"/api/user/GetWeiXinQRCodeForHT", {
Path: "/pages/index/index?user_id=" + row.Id,
With: 212
},
(res) => {
if (res.data.resultCode == 1) {
if (res.data.data) {
......@@ -705,7 +497,7 @@ export default {
if (res.data.resultCode == 1) {
this.detailData = res.data.data;
this.detailData.RealName = row.Name
this.detailShow=true
this.detailShow = true
} else {
this.$message({
message: res.data.message,
......@@ -716,42 +508,43 @@ export default {
},
},
mounted() {},
};
};
</script>
<style>
.usersList .remark_name {
.usersList .remark_name {
color: #888888;
font-size: 12px;
margin-left: 10px;
float: right;
}
}
.usersList .app-image {
.usersList .app-image {
background-position: center center;
width: 50px;
height: 50px;
border-radius: 0%;
float: left;
margin-right: 8px;
}
}
.usersList .blue {
.usersList .blue {
color: #409eff;
}
}
.usersList .content .searchInput {
.usersList .content .searchInput {
border: 1px solid #dcdfe6;
border-radius: 4px;
}
}
.usersList .content .searchInput .el-input__inner {
.usersList .content .searchInput .el-input__inner {
border: none;
outline: none;
height: 30px;
line-height: 30px;
}
}
.usersList .content .searchInput {
.usersList .content .searchInput {
line-height: normal;
display: inline-table;
width: 100%;
......@@ -759,12 +552,13 @@ export default {
border-spacing: 0;
width: 250px;
margin-right: 20px;
}
}
.usersList .content {
.usersList .content {
background: #fff;
margin-top: 10px;
padding: 20px;
box-sizing: border-box;
}
}
</style>
src/components/orderMan/orderList.vue
View file @ 58072edc
......@@ -2,14 +2,8 @@
<div class="orderList">
<div class="head-title">
订单列表
<el-upload
class="upload-demo"
ref="upload"
:action="importFileUrl"
:multiple="true"
:on-success="successUpload"
:show-file-list="false"
accept=".csv">
<el-upload class="upload-demo" ref="upload" :action="importFileUrl" :multiple="true" :on-success="successUpload"
:show-file-list="false" accept=".csv">
<el-button :loading="btnLoad" size="small" type="primary">
赞羊导入</el-button>
</el-upload>
......@@ -22,8 +16,8 @@
<div class="content">
<div>
<span>下单时间：</span>
<el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange" range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
<el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange"
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
<span style="margin-left:15px">所属平台：</span>
<el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.OrderSource" size="small"
......@@ -46,8 +40,9 @@
<el-option v-for="item in deliveryList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
<el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable style="margin-left:15px;width:300px" class="input-with-select"
placeholder="请输入内容" v-model="msgVal" size="small">
<el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable
style="margin-left:15px;width:300px" class="input-with-select" placeholder="请输入内容" v-model="msgVal"
size="small">
<el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
<el-option v-for="item in option" :key="item.Id" :label="item.name" :value="item.Id">
</el-option>
......@@ -57,12 +52,14 @@
</div>
<div style="display: flex;flex-direction: row;align-items: center;justify-content: space-between">
<div>
<span >主播名称：</span>
<el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable style="margin-top:10px;width:200px" class="input-with-select"
placeholder="请输入主播名称" v-model="msg.AnchorName" size="small">
<span>主播名称：</span>
<el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable
style="margin-top:10px;width:200px" class="input-with-select" placeholder="请输入主播名称" v-model="msg.AnchorName"
size="small">
</el-input>
<el-checkbox v-model="IsSelectPayMoney" true-label="1" false-label="0" style="margin-left: 15px" @change="msg.pageIndex=1,getList()">只看已付款</el-checkbox>
<el-checkbox v-model="IsSelectPayMoney" true-label="1" false-label="0" style="margin-left: 15px"
@change="msg.pageIndex=1,getList()">只看已付款</el-checkbox>
</div>
<div style="display: flex;flex-direction: row;align-items: center;font-size: 12px" v-if="TenantId==1">
<div class="fkbox">
......@@ -90,7 +87,8 @@
<div>
<el-tabs style="margin-top:20px" v-model="activeName" @tab-click="handleClick">
<el-tab-pane :dataId="0" label="全部" name="first" :key="0"></el-tab-pane>
<el-tab-pane v-for="item in orderStatusList" :key="item.Id" :dataId="item.Id" :name="item.Id.toString()" :label="item.Name">
<el-tab-pane v-for="item in orderStatusList" :key="item.Id" :dataId="item.Id" :name="item.Id.toString()"
:label="item.Name">
</el-tab-pane>
<el-tab-pane :dataId="8" label="回收站" :key="8" name="8"></el-tab-pane>
</el-tabs>
......@@ -113,11 +111,13 @@
<el-tag v-if="item.OrderSource==5" size="small" type="danger">{{item.OrderSourceName}}</el-tag>
<el-tag v-if="item.OrderSource==6" size="small" type="danger">{{item.OrderSourceName}}</el-tag>
</div>
<div class="app-order-user" v-if="item.SmallShopsName!=''&& item.SmallShopsName!=null&& item.SmallShopsId!=0 ">
<div class="app-order-user"
v-if="item.SmallShopsName!=''&& item.SmallShopsName!=null&& item.SmallShopsId!=0 ">
<span class="app-order-time">微店名称：</span>{{item.SmallShopsName}}
</div>
<div flex="cross:center" class="app-order-user">
<img v-if="item.OrderSource==1" src="../../assets/img/userman/wx.png" alt="">
<img v-if="item.OrderSource==2" style="width:25px;height:25px;" src="../../assets/img/userman/alipay.png" alt="" />
<span>{{item.UserName}}({{item.UserId}})</span>
</div>
<div v-if="item.BuyerMessage && item.BuyerMessage!=''" flex="cross:center" class="remark-box">
......@@ -159,7 +159,8 @@
<div class="goods-item" style="width: 65%;">
<div v-for="(list,index2) in item.DetailList" :key="index2" class="goods">
<div>
<el-image :src="list.CoverImagePath" class="goods-image" :preview-src-list="[list.CoverImagePath]"></el-image>
<el-image :src="list.CoverImagePath" class="goods-image" :preview-src-list="[list.CoverImagePath]">
</el-image>
<div flex="dir:left">
<div class="goods-info">
<div class="goods-name">
......@@ -176,34 +177,34 @@
<div style="margin-bottom: 5px;">
<span style="margin-right: 10px;">
规格：
<el-tag
:key="index2"
v-for="(msg,index2) in list.SpecificationList"
<el-tag :key="index2" v-for="(msg,index2) in list.SpecificationList"
style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
size="mini">
{{msg}}
</el-tag>
</span>
</div>
<div style=" display: flex;flex-direction: row;align-items: center;" v-if="list.SmallShopsCostPrice!=null && list.SmallShopsCostPrice!=''&& list.SmallShopsCostPrice>0&& item.SmallShopsId!=0">
<div style=" display: flex;flex-direction: row;align-items: center;"
v-if="list.SmallShopsCostPrice!=null && list.SmallShopsCostPrice!=''&& list.SmallShopsCostPrice>0&& item.SmallShopsId!=0">
<span>赞羊小计：￥{{list.SmallShopsCostPrice}}</span>
</div>
<div style=" display: flex;flex-direction: row;align-items: center;">
<span>货号：{{list.ProductCode!=null && list.ProductCode!=''?list.ProductCode:'无'}}</span>
<span style="margin-left:20px" v-if='list.FreeShippingRemarks!=null'>{{list.FreeShippingRemarks}}</span>
<span style="margin-left:20px"
v-if='list.FreeShippingRemarks!=null'>{{list.FreeShippingRemarks}}</span>
</div>
</div>
<div flex="dir:left box:mean" style="width: 350px;">
<div flex="cross:center main:center" style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;">
<div flex="cross:center main:center"
style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;">
<span style="cursor:pointer">小计：￥{{list.Final_Price}}
<img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)"
src="../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer">商品成本：￥{{ list.CostMoney}}
<img @click="costBtn(list,1)"
src="../../assets/img/userman/edit1.png" alt="">
<img @click="costBtn(list,1)" src="../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer">运费成本：￥{{list.FreightCostMoney}}
<img v-if="item.OrderStatus!==7" @click="costBtn(list,2)"
......@@ -214,17 +215,19 @@
src="../../assets/img/userman/edit1.png" alt="">
</span>
</div>
<!-- <div flex="cross:center main:center" style="width: 45px;">数量：x {{list.Number}}</div>-->
<!-- <div flex="cross:center main:center" style="width: 45px;">数量：x {{list.Number}}</div>-->
<div flex="cross:center main:center" style="display: flex;flex-direction: column;">
<div>
数量：x {{list.Number}}
</div>
<el-tag v-if="list.IsApplyForAfterSale && list.IsApplyForAfterSale == 1" size="small" type="danger">已退货退款</el-tag>
<el-tag v-if="list.IsApplyForAfterSale && list.IsApplyForAfterSale == 1" size="small"
type="danger">已退货退款</el-tag>
</div>
</div>
<div style="width: 200px; display: flex;flex-direction:column;justify-content: center" v-if="TenantId==1">
<div style="width: 200px; display: flex;flex-direction:column;justify-content: center"
v-if="TenantId==1">
<el-dropdown trigger="click" style="margin-left: 50px">
<span class="el-dropdown-link">制单</span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown">
......@@ -236,7 +239,8 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<div style="margin-top: 10px;font-size: 12px" v-if="list.YSMoney!=0 || list.RealMoney!=0 || list.YFMoney!=0 || list.PayMoney!=0">
<div style="margin-top: 10px;font-size: 12px"
v-if="list.YSMoney!=0 || list.RealMoney!=0 || list.YFMoney!=0 || list.PayMoney!=0">
其他费用：
</div>
<div style="font-size: 12px" v-if="list.YSMoney!=0 || list.RealMoney!=0">
......@@ -250,14 +254,17 @@
</div>
</div>
</div>
<div class="billStyle" v-if="(list.SFinanceList.length>0|| list.ZFinanceList.length >0) && TenantId==1">
<div class="billStyle"
v-if="(list.SFinanceList.length>0|| list.ZFinanceList.length >0) && TenantId==1">
<div class="billStyle_item" style="border-right: 1px solid #EBEEF5">
收入单据:
<span v-for="(item,index2) in list.SFinanceList" :key="index2" @click="goSF(item)">
<span class="billtext" v-if="item.Status == 0" :style="{color:'#00FFFF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1&& item.Is_Cashier!=1" :style="{color:'#0080FF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1&&item.Is_Cashier==1" :style="{color:'#FF4048'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 2" >{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1&& item.Is_Cashier!=1"
:style="{color:'#0080FF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1&&item.Is_Cashier==1"
:style="{color:'#FF4048'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 2">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 3" :style="{color:'#FFF100'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span>
</span>
......@@ -267,9 +274,11 @@
支出单据:
<span v-for="(item,index2) in list.ZFinanceList" :key="index2" @click="goZF(item)">
<span class="billtext" v-if="item.Status == 0" :style="{color:'#00FFFF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1 && item.Is_Cashier!=1" :style="{color:'#0080FF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1&&item.Is_Cashier==1" :style="{color:'#FF4048'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 2" >{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1 && item.Is_Cashier!=1"
:style="{color:'#0080FF'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 1&&item.Is_Cashier==1"
:style="{color:'#FF4048'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 2">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 3" :style="{color:'#FFF100'}">{{item.FrID}}</span>
<span class="billtext" v-if="item.Status == 4" :style="{color:'#800080'}">{{item.FrID}}</span>
</span>
......@@ -282,8 +291,7 @@
<div flex="dir:top">
<div>
<span style="font-size: 16px;">￥{{item.Income}}</span>
<el-popover placement="bottom" width="200" trigger="hover"
:content="'商品小计 '+ item.Income +'元'" >
<el-popover placement="bottom" width="200" trigger="hover" :content="'商品小计 '+ item.Income +'元'">
<img slot="reference" src="../../assets/img/userman/price.png" alt="">
</el-popover>
</div>
......@@ -296,22 +304,28 @@
<div>
<el-tag effect="dark" type="warning" size="mini">{{item.PaymentWayName}}</el-tag>
</div>
<div style="font-size: 12px;margin-top:3px;" v-if="item.CouponMoney&& item.CouponMoney!=''&& item.CouponMoney>0">
<div style="font-size: 12px;margin-top:3px;"
v-if="item.CouponMoney&& item.CouponMoney!=''&& item.CouponMoney>0">
<span>优惠金额:￥{{item.CouponMoney}}</span>
</div>
<div style="font-size: 12px;margin-top:3px;" v-if="item.DepositMoney&& item.DepositMoney!=''&& item.DepositMoney>0">
<div style="font-size: 12px;margin-top:3px;"
v-if="item.DepositMoney&& item.DepositMoney!=''&& item.DepositMoney>0">
<span>储蓄卡抵扣:￥{{item.DepositMoney}}</span>
</div>
<div style="font-size: 12px;margin-top:3px;" v-if="item.IntegralMoney&& item.IntegralMoney!=''&& item.IntegralMoney>0">
<div style="font-size: 12px;margin-top:3px;"
v-if="item.IntegralMoney&& item.IntegralMoney!=''&& item.IntegralMoney>0">
<span>积分抵用金额:￥{{item.IntegralMoney}}</span>
</div>
<div style="font-size: 12px;margin-top:3px;" v-if="item.DeductionCommission&&item.DeductionCommission>0">
<div style="font-size: 12px;margin-top:3px;"
v-if="item.DeductionCommission&&item.DeductionCommission>0">
<span>佣金抵用:￥{{item.DeductionCommission}}</span>
</div>
<div style="font-size: 12px" v-if="item.IntegralNumber&& item.IntegralNumber!=''&& item.IntegralNumber>0">
<div style="font-size: 12px"
v-if="item.IntegralNumber&& item.IntegralNumber!=''&& item.IntegralNumber>0">
<span>积分数:￥{{item.IntegralNumber}}</span>
</div>
<div style="font-size: 12px" v-if="item.MemberDiscountCouponList && item.MemberDiscountCouponList.length>0">
<div style="font-size: 12px"
v-if="item.MemberDiscountCouponList && item.MemberDiscountCouponList.length>0">
<span>优惠券信息:</span>
<span v-for="(MItem,Mindex) in item.MemberDiscountCouponList" :key="Mindex">
{{MItem.Name}}券,{{MItem.CouponType==1?'满'+MItem.MinConsumePrice+'元减'+MItem.DiscountsPrice+'元':'满'+MItem.MinConsumePrice+'元打'+MItem.DiscountsPrice+'折'}}
......@@ -374,9 +388,10 @@
<img @click="getOrderSend(item)" v-if="item.OrderStatus==3" class="app-order-icon"
src="../../assets/img/userman/change.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="线下付款" v-if="item.OrderStatus==1 || item.OrderStatus==7" placement="top">
<img @click="Offpayment(item)" v-if="item.OrderStatus==1 || item.OrderStatus==7" class="app-order-icon"
src="../../assets/img/userman/OfflinePayment.png" alt="">
<el-tooltip class="item" effect="dark" content="线下付款"
v-if="item.OrderStatus==1 || item.OrderStatus==7" placement="top">
<img @click="Offpayment(item)" v-if="item.OrderStatus==1 || item.OrderStatus==7"
class="app-order-icon" src="../../assets/img/userman/OfflinePayment.png" alt="">
</el-tooltip>
</template>
......@@ -406,8 +421,8 @@
</div>
</el-card>
</div>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
:page-size="msg.pageSize" layout="prev, pager, next" :total="total">
<el-pagination style="text-align:right" background @current-change="handleCurrentChange"
:current-page.sync="msg.pageIndex" :page-size="msg.pageSize" layout="prev, pager, next" :total="total">
</el-pagination>
</div>
</div>
......@@ -436,7 +451,8 @@
</el-dialog>
<!--待处理-->
<el-dialog custom-class="app-send" :title="pendMgs.Type==1?'同意':'拒绝'" :visible.sync="pendD" width="15%" class="tyi">
<el-input v-if="pendMgs.Type==2" type="textarea" size="small" v-model="pendMgs.Remark" placeholder="拒绝理由"></el-input>
<el-input v-if="pendMgs.Type==2" type="textarea" size="small" v-model="pendMgs.Remark" placeholder="拒绝理由">
</el-input>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="pendD = false">取 消</el-button>
<el-button size="small" type="primary" @click="pendingForm()">确 定</el-button>
......@@ -554,7 +570,8 @@
<div style="margin: 15px 0;"></div>
<div style="padding: 10px 25px 20px;">
<el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
<el-checkbox style="margin-bottom:10px;width:135px" v-for="city in cities" :label="city.Id" :key="city.Name">
<el-checkbox style="margin-bottom:10px;width:135px" v-for="city in cities" :label="city.Id"
:key="city.Name">
{{city.Name}}</el-checkbox>
</el-checkbox-group>
</div>
......@@ -602,7 +619,9 @@
<el-dialog :title="cosType==1?'商品成本修改':'运费成本修改'" :visible.sync="costDig" width="600px">
<el-form :model="costMsg" ref="costMsg" label-width="80px">
<el-form-item :label="cosType==1?'商品成本':'运费成本'">
<el-input size="small" v-model="costMsg.Money" step="1" min="0" onkeyup="this.value= this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : ''"></el-input>
<el-input size="small" v-model="costMsg.Money" step="1" min="0"
onkeyup="this.value= this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : ''">
</el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
......@@ -641,11 +660,11 @@
FreightMoney: '',
},
priceDig: false,
costDig:false,//商品、运费成本的修改
cosType:1,
costMsg:{
Id:0,
Money:0,
costDig: false, //商品、运费成本的修改
cosType: 1,
costMsg: {
Id: 0,
Money: 0,
},
hstips: '是否放入回收站(可在回收站中恢复)?',
orderStatusList: [],
......@@ -712,14 +731,14 @@
OrderDetailIdList: [],
},
// 待处理
pendMgs:{
OrderId:0,
Type:1,
Remark:0,
pendMgs: {
OrderId: 0,
Type: 1,
Remark: 0,
},
fahuoList: [],
fhDig: false,
pendD:false,
pendD: false,
exitMsg: {
OrderId: 0,
Type: 1,
......@@ -750,10 +769,10 @@
Mobile: '',
ProductCode: '',
Recycled: 2,
AnchorName:'',
IsSelectPayMoney:0,
AnchorName: '',
IsSelectPayMoney: 0,
},
IsSelectPayMoney:0,
IsSelectPayMoney: 0,
platList: [],
option: [{
Id: 1,
......@@ -803,23 +822,23 @@
moresendtips: '',
hszDig: false,
hszMsg: {},
btnLoad:false,
upSupliDilog:false, // 修改供应商弹窗
SuplierList:[], // 供应商下拉数据
SupplierId:0, //公用供应商id 给弹窗用
CommonId:0, //公用id 给弹窗用
TenantId:0,
btnLoad: false,
upSupliDilog: false, // 修改供应商弹窗
SuplierList: [], // 供应商下拉数据
SupplierId: 0, //公用供应商id 给弹窗用
CommonId: 0, //公用id 给弹窗用
TenantId: 0,
}
},
created() {
let currentUser = this.getLocalStorage()
this.TenantId = currentUser.TenantId
if(this.$route.query.TypeId){
this.msgId=Number(this.$route.query.TypeId)
if (this.$route.query.TypeId) {
this.msgId = Number(this.$route.query.TypeId)
}
if(this.$route.query.UserId){
this.msgVal=Number(this.$route.query.UserId);
this.msg.UserId=Number(this.$route.query.UserId)
if (this.$route.query.UserId) {
this.msgVal = Number(this.$route.query.UserId);
this.msg.UserId = Number(this.$route.query.UserId)
}
this.getList();
this.getplat();
......@@ -832,15 +851,17 @@
},
mounted() {},
methods: {
successUpload(file){
let path=file.data.Path;
this.btnLoad=true;
this.apipost("/api/order/SetGoodsOrderBatchImport", {FilePath:path}, res => {
this.btnLoad=false;
successUpload(file) {
let path = file.data.Path;
this.btnLoad = true;
this.apipost("/api/order/SetGoodsOrderBatchImport", {
FilePath: path
}, res => {
this.btnLoad = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.getList();
}else{
} else {
this.Error(res.data.message)
}
......@@ -902,8 +923,7 @@
this.msg.Consignee = '';
this.msg.Mobile = '';
this.msg.ProductCode = '';
}
else if (val == 2) {
} else if (val == 2) {
this.msg.OrderNo = '';
this.msg.MerchantsNo = msgVal;
this.msg.UserName = '';
......@@ -912,8 +932,7 @@
this.msg.Consignee = '';
this.msg.Mobile = '';
this.msg.ProductCode = '';
}
else if (val == 3) {
} else if (val == 3) {
this.msg.OrderNo = '';
this.msg.MerchantsNo = '';
this.msg.UserName = msgVal;
......@@ -922,8 +941,7 @@
this.msg.Consignee = '';
this.msg.Mobile = '';
this.msg.ProductCode = '';
}
else if (val == 4) {
} else if (val == 4) {
this.msg.OrderNo = '';
this.msg.MerchantsNo = '';
this.msg.UserName = '';
......@@ -932,8 +950,7 @@
this.msg.Consignee = '';
this.msg.Mobile = '';
this.msg.ProductCode = '';
}
else if (val == 5) {
} else if (val == 5) {
this.msg.OrderNo = '';
this.msg.MerchantsNo = '';
this.msg.UserName = '';
......@@ -942,8 +959,7 @@
this.msg.Consignee = '';
this.msg.Mobile = '';
this.msg.ProductCode = '';
}
else if (val == 6) {
} else if (val == 6) {
this.msg.OrderNo = '';
this.msg.MerchantsNo = '';
this.msg.UserName = '';
......@@ -952,8 +968,7 @@
this.msg.Consignee = msgVal;
this.msg.Mobile = '';
this.msg.ProductCode = '';
}
else if (val == 7) {
} else if (val == 7) {
this.msg.OrderNo = '';
this.msg.MerchantsNo = '';
this.msg.UserName = '';
......@@ -962,8 +977,7 @@
this.msg.Consignee = '';
this.msg.Mobile = msgVal;
this.msg.ProductCode = '';
}
else if (val == 8) {
} else if (val == 8) {
this.msg.OrderNo = '';
this.msg.MerchantsNo = '';
this.msg.UserName = '';
......@@ -989,8 +1003,8 @@
null
);
},
pending(item,type){
this.pendD=true;
pending(item, type) {
this.pendD = true;
this.pendMgs.OrderId = item.OrderId;
this.pendMgs.Type = type;
this.pendMgs.Remark = '';
......@@ -998,18 +1012,18 @@
},
// 待处理调用接口
pendingForm(){
this.loading=true;
pendingForm() {
this.loading = true;
this.apipost('/api/order/SetOrderApplyForCancelAudit', this.pendMgs,
res => {
if (res.data.resultCode === 1) {
this.pendD= false;
this.loading=false;
this.pendD = false;
this.loading = false;
this.getList();
this.Success(res.data.message)
} else {
this.Error(res.data.message);
this.loading=false;
this.loading = false;
}
},
......@@ -1128,14 +1142,16 @@
});
},
Offpayment(item){//线下付款
Offpayment(item) { //线下付款
let that = this;
that.$confirm('确认转为线下付款，转后无法恢复!', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/order/SetOrderOfflinePayment', {OrderId:item.OrderId},
this.apipost('/api/order/SetOrderOfflinePayment', {
OrderId: item.OrderId
},
res => {
if (res.data.resultCode === 1) {
this.getList();
......@@ -1358,27 +1374,28 @@
this.exitDig = true;
},
// 强制取消
OrderExit2(item){
let that=this;
let text='';
if(item.OrderStatus==1){
text='确认取消?'
}else if(item.OrderStatus==2){
text='确认取消?客人付款金额将原路退回。'
OrderExit2(item) {
let that = this;
let text = '';
if (item.OrderStatus == 1) {
text = '确认取消?'
} else if (item.OrderStatus == 2) {
text = '确认取消?客人付款金额将原路退回。'
}
that.Confirm(text, function () {
that.loading= true
that.loading = true
that.apipost(
"/api/order/SetOrderForcedToCancel",
{OrderId:item.OrderId},
"/api/order/SetOrderForcedToCancel", {
OrderId: item.OrderId
},
res => {
if (res.data.resultCode == 1) {
that.loading= false
that.loading = false
that.Success(res.data.message);
that.getList();
} else {
that.Error(res.data.message);
that.loading= false
that.loading = false
}
},
......@@ -1396,12 +1413,12 @@
this.msg.OrderStatus = 0;
this.msg.Recycled = 1;
}
this.msg.pageIndex=1
this.msg.pageIndex = 1
this.getList();
},
getList() {
let that=this;
let that = this;
that.ChangeId(that.msgId);
if (!this.msgVal || this.msgVal == '') {
this.msg.OrderNo = '';
......@@ -1494,14 +1511,14 @@
}
})
},
costBtn(list,type){
this.cosType=type;
if(type==1){
costBtn(list, type) {
this.cosType = type;
if (type == 1) {
this.costMsg.Id = list.Id;
this.costMsg.Money = list.CostMoney;
}else if(type==2){
} else if (type == 2) {
this.costMsg.Id = list.Id;
this.costMsg.Money = list.FreightCostMoney>0 ? list.FreightCostMoney:list.FreightMoney;
this.costMsg.Money = list.FreightCostMoney > 0 ? list.FreightCostMoney : list.FreightMoney;
}
this.costDig = true;
},
......@@ -1514,17 +1531,17 @@
if (this.cosType == 1) {
cmd = '/api/order/SetOrderCostMoney';
msg = {
Id:this.costMsg.Id,
CostMoney:Number(this.costMsg.Money),
EmpId:this.getLocalStorage().EmpId
Id: this.costMsg.Id,
CostMoney: Number(this.costMsg.Money),
EmpId: this.getLocalStorage().EmpId
}
} else if(this.cosType == 2){
} else if (this.cosType == 2) {
cmd = '/api/order/SetOrderFreightCostMoney';
msg = {
Id:this.costMsg.Id,
FreightCostMoney:Number(this.costMsg.Money) ,
EmpId:this.getLocalStorage().EmpId
Id: this.costMsg.Id,
FreightCostMoney: Number(this.costMsg.Money),
EmpId: this.getLocalStorage().EmpId
}
}
this.apipost(cmd, msg,
......@@ -1555,59 +1572,69 @@
},
//修改供应商
UpdateSuplier(item){
this.upSupliDilog=true;
this.SupplierId=item.SupplierId;
this.CommonId=item.Id;
UpdateSuplier(item) {
this.upSupliDilog = true;
this.SupplierId = item.SupplierId;
this.CommonId = item.Id;
this.getSupplierList();
},
//保存供应商
SaveSuplier(){
let msg={
Id:this.CommonId,
SupplierId:this.SupplierId
SaveSuplier() {
let msg = {
Id: this.CommonId,
SupplierId: this.SupplierId
}
this.apipost("/api/Order/SetOrderSupplierId", msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.upSupliDilog=false;
this.upSupliDilog = false;
this.getList();
}
});
},
goCollection(item,list){//跳到erp收款单
goCollection(item, list) { //跳到erp收款单
let currentUser = this.getLocalStorage()
let companyID =currentUser.ERPBranchId !=0 ?currentUser.ERPBranchId :1224;
let companyID = currentUser.ERPBranchId != 0 ? currentUser.ERPBranchId : 1224;
let orderObj = {
OrderSource:16,
OtherType:21,
ReFinanceId:item.OrderId,//订单id
ReFinanceId2:list.Id,//订单商品id
ECOrderList:[{ECOrderId:item.OrderId,ECOrderDetailId:list.Id}]
OrderSource: 16,
OtherType: 21,
ReFinanceId: item.OrderId, //订单id
ReFinanceId2: list.Id, //订单商品id
ECOrderList: [{
ECOrderId: item.OrderId,
ECOrderDetailId: list.Id
}]
}
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=1&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj))
window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=1&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj))
window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=1&companyID=' + companyID + '&orderObj=' +
JSON.stringify(orderObj))
},
goPayment(item,list){//跳到erp付款单
goPayment(item, list) { //跳到erp付款单
let currentUser = this.getLocalStorage()
let companyID =currentUser.ERPBranchId !=0 ?currentUser.ERPBranchId :1224;
let companyID = currentUser.ERPBranchId != 0 ? currentUser.ERPBranchId : 1224;
let orderObj = {
OrderSource:16,
OtherType:22,
ReFinanceId:item.OrderId,
ReFinanceId2:list.Id,
ECOrderList:[{ECOrderId:item.OrderId,ECOrderDetailId:list.Id}]
OrderSource: 16,
OtherType: 22,
ReFinanceId: item.OrderId,
ReFinanceId2: list.Id,
ECOrderList: [{
ECOrderId: item.OrderId,
ECOrderDetailId: list.Id
}]
}
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=2&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj))
window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=2&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj))
window.open('http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=2&companyID=' + companyID + '&orderObj=' +
JSON.stringify(orderObj))
},
goSF(item){//收入详情
goSF(item) { //收入详情
// window.open('http://www.test.com:8081/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id=' + item.FrID +
'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
},
goZF(item){//付款详情
goZF(item) { //付款详情
// window.open('http://www.test.com:8081/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id='+item.FrID+'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id=' + item.FrID +
'&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
}
},
};
......@@ -1615,15 +1642,17 @@
</script>
<style>
.orderList .remark-box {
.orderList .remark-box {
padding-top: 3px;
margin-left: 7px;
}
.orderList .upload-demo{
float:right;
}
.orderList .upload-demo {
float: right;
margin-top: -5px;
margin-left:20px;
margin-left: 20px;
}
.orderList .pendSelect .el-input {
width: 100px;
}
......@@ -1631,11 +1660,11 @@
.hszDigClass .el-dialog__body {
padding: 0 10px 20px 0;
}
.orderList .tyi .el-dialog__body{
padding:0 20px
.orderList .tyi .el-dialog__body {
padding: 0 20px
}
.sendDigClass .el-dialog__body {
padding: 0 10px 10px 0;
}
......@@ -1839,24 +1868,29 @@
padding: 20px;
box-sizing: border-box;
}
.orderList .billStyle{
.orderList .billStyle {
width: 100%;
display: flex;flex-direction: row;
display: flex;
flex-direction: row;
align-items: center;
border: 1px solid #EBEEF5;
margin-top: 20px;
}
.orderList .billStyle .billStyle_item{
.orderList .billStyle .billStyle_item {
width: 50%;
padding: 5px;
}
.orderList .billStyle .billtext{
.orderList .billStyle .billtext {
font-size: 14px;
cursor: pointer;
margin-right: 5px;
text-decoration:underline;
}
.orderList .el-dropdown-link{
text-decoration: underline;
}
.orderList .el-dropdown-link {
height: 30px;
line-height: 30px;
background-color: #409EFF;
......@@ -1868,17 +1902,19 @@
cursor: pointer;
display: inline-block;
}
.orderList .fkbox{
.orderList .fkbox {
display: flex;
flex-direction: row;
align-items: center;
margin-right: 15px;
}
.orderList .fkbox .fkbox_item{
.orderList .fkbox .fkbox_item {
width: 10px;
height: 10px;
border-radius: 2px;
margin-right: 4px;
}
}
</style>
src/router/index.js
View file @ 58072edc
......@@ -106,6 +106,24 @@ export default new Router({
}
]
},
{
path: '/FALiPaySetting', //支付宝小程序设置
name: 'FALiPaySetting',
component: resolve => require(['@/components/FALiPaySetting'], resolve),
children: [
//店铺管理 支付宝基础设置
{
path: '/ALiPayAppConfig',
name: 'ALiPayAppConfig',
component: resolve => require(['@/components/StoreDesign/ALiPayAppConfig'], resolve),
}, //店铺管理 支付宝基础设置
{
path: '/ALiPayAppMsg',
name: 'ALiPayAppMsg',
component: resolve => require(['@/components/StoreDesign/ALiPayAppMsg'], resolve),
},
]
},
{
path: '/Ftemplate', //DIY装修
name: 'Ftemplate',
......
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