Skip to content

E
ElectricitySheep
Commit 9f730dbd authored by 罗超's avatar 罗超
Browse files
Options

2

parent 3fe5d7d9
Show whitespace changes
Inline Side-by-side
Showing with 702 additions and 1086 deletions
src/components/coffeeManage/edit.vue
View file @ 9f730dbd
......@@ -2511,7 +2511,7 @@
this.addMsg.MaterialId = val.Id
this.addMsg.CarouselImageList = val.ImageList
this.addMsg.SellingPrice = val.SellPrice
this.addMsg.OriginalPrice = val.Money
this.addMsg.OriginalPrice = val.SellPrice
this.addMsg.CostPrice = val.Money
this.addMsg.Unit = val.Units||'件'
this.addMsg.InventoryNum = val.InventoryNum
......
src/components/coffeeManage/index.vue
View file @ 9f730dbd
......@@ -2,13 +2,8 @@
<div class="goodsList">
<div class="">
商品列表
<el-button
@click="goGoodsEdit(0)"
style="float: right; margin-top: -5px; margin-left: 20px"
size="small"
type="primary"
>添加商品</el-button
>
<el-button @click="goGoodsEdit(0)" style="float: right; margin-top: -5px; margin-left: 20px" size="small"
type="primary">添加商品</el-button>
</div>
<div class="content">
<div>
......@@ -28,99 +23,60 @@
getList()
" type="danger" style="margin-right: 10px" size="small">清除分类</el-button> -->
<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>
<div class="searchInput" style="width: 250px; margin-right: 0px">
<el-input
@keyup.enter.native="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 225px; height: 30px"
placeholder="请输入名称搜索"
v-model="msg.Name"
@clear="(msg.pageIndex = 1), getList()"
size="small"
clearable
>
<el-input @keyup.enter.native="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 225px; height: 30px" placeholder="请输入名称搜索" v-model="msg.Name"
@clear="(msg.pageIndex = 1), getList()" 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: 250px">
<el-input
@keyup.enter.native="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 225px; height: 30px"
placeholder="请输入ID搜索"
v-model="msg.Id"
@clear="(msg.pageIndex = 1), getList()"
size="small"
clearable
>
<el-input @keyup.enter.native="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 225px; height: 30px" placeholder="请输入ID搜索" v-model="msg.Id"
@clear="(msg.pageIndex = 1), getList()" 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>
<span
@click="Clearconditions"
v-if="
<div class="searchInput" style="width: 250px">
<el-input @keyup.enter.native="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 225px; height: 30px" placeholder="请输入资产编号搜索" v-model="msg.MaterialId"
@clear="(msg.pageIndex = 1), getList()" size="small" clearable>
</el-input>
<span @click="(msg.pageIndex = 1), getList()" class="el-icon-search" style="
color: #979dad;
font-size: 14px;
position: relative;
top: 1px;
"></span>
</div>
<span @click="Clearconditions" v-if="
msg.Name != '' ||
msg.CategoryIds != '' ||
(dateList && dateList.length > 0)
"
class="blue point"
>清空筛选条件</span
>
" class="blue point">清空筛选条件</span>
</div>
<div style="margin-top: 15px">
<el-button @click="tableSet(4)" style="margin-left: 10px" size="mini"
>上架</el-button
>
<el-button @click="tableSet(5)" style="margin-left: 10px" size="mini"
>下架</el-button
>
<el-button @click="tableSet(6)" style="margin-left: 10px" size="mini"
>删除</el-button
>
<el-button
@click="plsetBtn"
style="margin-left: 10px"
size="mini"
v-if="currentUserInfo.IsKorea == 0"
>批量设置
<el-button @click="tableSet(4)" style="margin-left: 10px" size="mini">上架</el-button>
<el-button @click="tableSet(5)" style="margin-left: 10px" size="mini">下架</el-button>
<el-button @click="tableSet(6)" style="margin-left: 10px" size="mini">删除</el-button>
<el-button @click="plsetBtn" style="margin-left: 10px" size="mini" v-if="currentUserInfo.IsKorea == 0">批量设置
</el-button>
</div>
<el-table
:data="tableData"
v-loading="loading"
border
sortable="custom"
@sort-change="getSort"
@selection-change="tableSelect"
style="width: 100%; margin: 20px 0"
>
<el-table :data="tableData" v-loading="loading" border sortable="custom" @sort-change="getSort"
@selection-change="tableSelect" style="width: 100%; margin: 20px 0">
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="Id" width="80" sortable label="ID">
</el-table-column>
......@@ -128,34 +84,17 @@
<template slot-scope="scope">
<template v-if="!scope.row.editsort">
<span>{{ scope.row.Sort }}</span>
<img
@click="
<img @click="
(scope.row.editsort = true),
(scope.row.SortNew = scope.row.Sort)
"
style="width: 15px; height: 15px; margin-left: 7px"
src="../../assets/img/userman/edit1.png"
alt=""
/>
" style="width: 15px; height: 15px; margin-left: 7px" src="../../assets/img/userman/edit1.png"
alt="" />
</template>
<template v-else>
<el-input
v-model="scope.row.SortNew"
type="number"
min="1"
size="small"
style="display: inline-block; width: 70px"
></el-input>
<span
@click="scope.row.editsort = false"
class="el-icon-error"
style="color: rgb(245, 108, 108)"
></span>
<span
@click="Edit(scope.row, 1)"
class="el-icon-success"
style="color: #67c23a"
></span>
<el-input v-model="scope.row.SortNew" type="number" min="1" size="small"
style="display: inline-block; width: 70px"></el-input>
<span @click="scope.row.editsort = false" class="el-icon-error" style="color: rgb(245, 108, 108)"></span>
<span @click="Edit(scope.row, 1)" class="el-icon-success" style="color: #67c23a"></span>
</template>
</template>
</el-table-column>
......@@ -163,152 +102,85 @@
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.GoodsEduType==1">咖啡券</el-tag>
<el-tag type="success" v-if="scope.row.GoodsEduType==2">资产</el-tag>
<div v-if="scope.row.GoodsEduType==2" style="font-size:12px">编号：{{scope.row.MaterialId}}</div>
</template>
</el-table-column>
<el-table-column prop="Remark" label="分类">
<template slot-scope="scope">
<el-tag
size="mini"
v-if="scope.row.CategoryList && scope.row.CategoryList.length > 0"
>
{{ scope.row.CategoryList[0].CategoryName }}</el-tag
>
<el-tag size="mini" v-if="scope.row.CategoryList && scope.row.CategoryList.length > 0">
{{ scope.row.CategoryList[0].CategoryName }}</el-tag>
<el-tooltip class="item" effect="dark" placement="top">
<div slot="content">
<span
v-for="(item, index) in scope.row.CategoryList"
:key="index"
>{{ item.CategoryName }}
<span v-for="(item, index) in scope.row.CategoryList" :key="index">{{ item.CategoryName }}
</span>
</div>
<span
v-if="scope.row.CategoryList.length > 1 && index == 0"
v-for="(item, index) in scope.row.CategoryList"
:key="index"
>...</span
>
<span v-if="scope.row.CategoryList.length > 1 && index == 0"
v-for="(item, index) in scope.row.CategoryList" :key="index">...</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="address" width="300" label="商品名称">
<template slot-scope="scope">
<div flex="box:first">
<el-image
title="点击查看大图"
style="width: 50px; height: 50px; margin-right: 1px"
:src="scope.row.CoverImage"
:preview-src-list="scope.row.CarouselImageList"
>
<el-image title="点击查看大图" style="width: 50px; height: 50px; margin-right: 1px" :src="scope.row.CoverImage"
:preview-src-list="scope.row.CarouselImageList">
</el-image>
<template v-if="!scope.row.editname">
<div flex="cross:top" style="display: inline-flex">
<div flex="dir:left">
<el-tooltip
class="item"
effect="dark"
:content="scope.row.Name"
placement="top"
>
<div
class="vue-line-clamp"
style="word-break: break-all; -webkit-line-clamp: 2"
>
<el-tooltip class="item" effect="dark" :content="scope.row.Name" placement="top">
<div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 2">
<span>{{ scope.row.Name }}</span>
</div>
</el-tooltip>
<img
@click="
<img @click="
(scope.row.editname = true),
(scope.row.NameNew = scope.row.Name)
"
style="width: 15px; height: 15px; margin-left: 7px"
src="../../assets/img/userman/edit1.png"
alt=""
/>
" style="width: 15px; height: 15px; margin-left: 7px" src="../../assets/img/userman/edit1.png"
alt="" />
</div>
</div>
</template>
<template v-else>
<el-input
v-model="scope.row.NameNew"
size="small"
style="display: inline-block; width: 150px"
>
<el-input v-model="scope.row.NameNew" size="small" style="display: inline-block; width: 150px">
</el-input>
<span
@click="scope.row.editname = false"
class="el-icon-error"
style="
<span @click="scope.row.editname = false" class="el-icon-error" style="
margin-left: 5px;
color: rgb(245, 108, 108);
position: relative;
top: 9px;
"
></span>
<span
@click="Edit(scope.row, 2)"
class="el-icon-success"
style="color: #67c23a; position: relative; top: 9px"
></span>
"></span>
<span @click="Edit(scope.row, 2)" class="el-icon-success"
style="color: #67c23a; position: relative; top: 9px"></span>
</template>
</div>
<div
flex="dir:left"
style="margin-top: 5px; color: #f56c6c; font-size: 12px"
v-if="scope.row.Remark"
>
<div flex="dir:left" style="margin-top: 5px; color: #f56c6c; font-size: 12px" v-if="scope.row.Remark">
<div style="width: 38px">备注：</div>
<el-tooltip
class="item"
effect="dark"
:content="scope.row.Remark"
placement="top"
>
<div
class="vue-line-clamp"
style="
<el-tooltip class="item" effect="dark" :content="scope.row.Remark" placement="top">
<div class="vue-line-clamp" style="
word-break: break-all;
-webkit-line-clamp: 2;
width: 90%;
margin-left: 0;
"
>
">
<span>{{ scope.row.Remark }}</span>
</div>
</el-tooltip>
</div>
</template>
</el-table-column>
<el-table-column
prop="SellingPrice"
width="100"
sortable
label="售价"
v-if="currentUserInfo.IsKorea == 0"
>
<el-table-column prop="SellingPrice" width="100" sortable label="售价" v-if="currentUserInfo.IsKorea == 0">
</el-table-column>
<el-table-column
prop="InventoryNum"
width="100"
sortable
label="库存"
v-if="currentUserInfo.IsKorea == 0"
>
<el-table-column prop="InventoryNum" width="100" sortable label="库存" v-if="currentUserInfo.IsKorea == 0">
<template slot-scope="scope">
<span v-if="scope.row.InventoryNum == 0" style="color: red"
>售罄</span
>
<span v-if="scope.row.InventoryNum == 0" style="color: red">售罄</span>
<span v-else>{{ scope.row.InventoryNum }}</span>
</template>
</el-table-column>
<el-table-column width="120" v-if="currentUserInfo.IsKorea == 0">
<template slot="header">
已出售量
<el-tooltip
effect="dark"
content="已出售量=实际销量+虚拟销量，按实际销量排序"
placement="top"
>
<el-tooltip effect="dark" content="已出售量=实际销量+虚拟销量，按实际销量排序" placement="top">
<i class="el-icon-info"></i>
</el-tooltip>
</template>
......@@ -316,20 +188,10 @@
<span>{{ scope.row.GoodsBuyNum }}+{{ scope.row.SalesNum }}</span>
</template>
</el-table-column>
<el-table-column
prop="UpdateDate"
width="110"
label="是否加入快速购买"
v-if="currentUserInfo.IsKorea == 0"
>
<el-table-column prop="UpdateDate" width="110" label="是否加入快速购买" v-if="currentUserInfo.IsKorea == 0">
<template slot-scope="scope">
<el-switch
@change="Edit(scope.row, 10)"
v-model="scope.row.IsQuickBuy"
active-color="#409EFF"
:active-value="1"
:inactive-value="0"
>
<el-switch @change="Edit(scope.row, 10)" v-model="scope.row.IsQuickBuy" active-color="#409EFF"
:active-value="1" :inactive-value="0">
</el-switch>
</template>
</el-table-column>
......@@ -337,146 +199,81 @@
</el-table-column>
<el-table-column prop="UpdateDate" width="100" label="状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.GoodsStatus == 1" type="success"
>销售中</el-tag
>
<el-tag v-if="scope.row.GoodsStatus == 2" type="warning"
>下架中</el-tag
>
<el-tag v-if="scope.row.GoodsStatus == 1" type="success">销售中</el-tag>
<el-tag v-if="scope.row.GoodsStatus == 2" type="warning">下架中</el-tag>
</template>
</el-table-column>
<el-table-column prop="address" width="250" label="操作">
<template slot-scope="scope">
<span
v-if="
<span v-if="
currentUserInfo.TenantId == 1 &&
currentUserInfo.MallBaseId == 1 &&
(currentUserInfo.EmpId == 0 ||
currentUserInfo.IsOtherUpdateGoods == 1 ||
currentUserInfo.EmpId == scope.row.CreateBy)
"
>
<img
@click="goGoodsEdit(scope.row.Id)"
style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/edit.png"
alt=""
/>
<img
@click="Delete(scope.row)"
style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/del.png"
alt=""
/>
">
<img @click="goGoodsEdit(scope.row.Id)" style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/edit.png" alt="" />
<img @click="Delete(scope.row)" style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/del.png" alt="" />
</span>
<span
v-if="
<span v-if="
currentUserInfo.TenantId != 1 && currentUserInfo.MallBaseId != 1
"
>
<img
@click="goGoodsEdit(scope.row.Id)"
style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/edit.png"
alt=""
/>
<img
@click="Delete(scope.row)"
style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/del.png"
alt=""
/>
">
<img @click="goGoodsEdit(scope.row.Id)" style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/edit.png" alt="" />
<img @click="Delete(scope.row)" style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/del.png" alt="" />
</span>
</template>
</el-table-column>
</el-table>
<el-pagination
style="text-align: right"
background
@current-change="handleCurrentChange"
:page-size="msg.pageSize"
layout="prev, pager, next"
:current-page.sync="msg.pageIndex"
:total="total"
>
<el-pagination style="text-align: right" background @current-change="handleCurrentChange"
:page-size="msg.pageSize" layout="prev, pager, next" :current-page.sync="msg.pageIndex" :total="total">
</el-pagination>
</div>
<!-- 选择分类 -->
<el-dialog
custom-class="app-add-cat"
title="选择分类"
:visible.sync="flDig"
width="1100px"
>
<el-dialog custom-class="app-add-cat" title="选择分类" :visible.sync="flDig" width="1100px">
<el-row>
<el-col :span="8" style="padding: 0 10px; box-sizing: border-box">
<h3 style="padding: 15px 0">一级分类</h3>
<div class="app-goods-cat-list active">
<el-checkbox-group v-model="checkList">
<div
v-for="(item, index) in fenleiData"
:key="index"
flex="dir:left box:first"
class="cat-item"
>
<div v-for="(item, index) in fenleiData" :key="index" flex="dir:left box:first" class="cat-item">
<el-checkbox :label="item">
<span style="display: none">{{ item.Name }}</span>
</el-checkbox>
<div flex="box:last cross:center">
<span>{{ item.Name }}</span>
<i
v-if="item.ChildList.length > 0"
@click="getChild2(item.ChildList)"
class="el-icon-arrow-right"
></i>
<i v-if="item.ChildList.length > 0" @click="getChild2(item.ChildList)"
class="el-icon-arrow-right"></i>
</div>
</div>
</el-checkbox-group>
</div>
</el-col>
<el-col
v-show="childList2.length > 0"
:span="8"
style="padding: 0 10px; box-sizing: border-box"
>
<el-col v-show="childList2.length > 0" :span="8" style="padding: 0 10px; box-sizing: border-box">
<h3 style="padding: 15px 0">二级分类</h3>
<div class="app-goods-cat-list active">
<el-checkbox-group v-model="checkList">
<div
v-for="(item, index) in childList2"
:key="index"
flex="dir:left box:first"
class="cat-item"
>
<div v-for="(item, index) in childList2" :key="index" flex="dir:left box:first" class="cat-item">
<el-checkbox :label="item">
<span style="display: none">{{ item.Name }}</span>
</el-checkbox>
<div flex="box:last cross:center">
<span>{{ item.Name }}</span>
<i
v-if="item.ChildList.length > 0"
@click="getChild3(item.ChildList)"
class="el-icon-arrow-right"
></i>
<i v-if="item.ChildList.length > 0" @click="getChild3(item.ChildList)"
class="el-icon-arrow-right"></i>
</div>
</div>
</el-checkbox-group>
</div>
</el-col>
<el-col
v-show="childList3.length > 0"
:span="8"
style="padding: 0 10px; box-sizing: border-box"
>
<el-col v-show="childList3.length > 0" :span="8" style="padding: 0 10px; box-sizing: border-box">
<h3 style="padding: 15px 0">三级分类</h3>
<div class="app-goods-cat-list active">
<el-checkbox-group v-model="checkList">
<div
v-for="(item, index) in childList3"
:key="index"
flex="dir:left box:first"
class="cat-item"
>
<div v-for="(item, index) in childList3" :key="index" flex="dir:left box:first" class="cat-item">
<el-checkbox :label="item">
<span style="display: none">{{ item.Name }}</span>
</el-checkbox>
......@@ -490,159 +287,75 @@
</el-col>
</el-row>
<div class="tag-box">
<el-tag
@close="exitCheck(item)"
v-for="(item, index) in checkList"
:key="index"
type="warning"
closable
style="margin-right: 5px"
>{{ item.Name }}</el-tag
>
<el-tag @close="exitCheck(item)" v-for="(item, index) in checkList" :key="index" type="warning" closable
style="margin-right: 5px">{{ item.Name }}</el-tag>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="flDig = false">取 消</el-button>
<el-button @click="chooseFl" size="small" type="primary"
>确 定</el-button
>
<el-button @click="chooseFl" size="small" type="primary">确 定</el-button>
</span>
</el-dialog>
<!-- 批量修改 -->
<el-dialog
custom-class="plxg"
title="批量修改"
:visible.sync="plDig"
width="960px"
>
<el-dialog custom-class="plxg" title="批量修改" :visible.sync="plDig" width="960px">
<span class="absoSpan">已选商品{{ GoodsIds.length }}个</span>
<div class="batch-remark c99 f14">
注：每次只能修改一项，修改后点击确定即可生效。如需修改多项，需多次操作。
</div>
<div style="margin-top: 15px" flex="dir:left box:first">
<div flex="dir:top" class="batch-box-left">
<div
flex="main:center"
@click="ClearSelect(7)"
:class="plszMsg.Type == 7 ? 'batch-div-active' : ''"
>
<div flex="main:center" @click="ClearSelect(7)" :class="plszMsg.Type == 7 ? 'batch-div-active' : ''">
运费
</div>
<div
flex="main:center"
@click="ClearSelect(8)"
:class="plszMsg.Type == 8 ? 'batch-div-active' : ''"
>
<div flex="main:center" @click="ClearSelect(8)" :class="plszMsg.Type == 8 ? 'batch-div-active' : ''">
限购
</div>
<div
flex="main:center"
@click="ClearSelect(9)"
:class="plszMsg.Type == 9 ? 'batch-div-active' : ''"
>
<div flex="main:center" @click="ClearSelect(9)" :class="plszMsg.Type == 9 ? 'batch-div-active' : ''">
积分
</div>
<div
flex="main:center"
@click="ClearSelect(10)"
:class="plszMsg.Type == 10 ? 'batch-div-active' : ''"
>
<div flex="main:center" @click="ClearSelect(10)" :class="plszMsg.Type == 10 ? 'batch-div-active' : ''">
快速购买
</div>
<div
flex="main:center"
@click="ClearSelect(11)"
:class="plszMsg.Type == 11 ? 'batch-div-active' : ''"
>
<div flex="main:center" @click="ClearSelect(11)" :class="plszMsg.Type == 11 ? 'batch-div-active' : ''">
面议
</div>
<div
flex="main:center"
@click="ClearSelect(12)"
:class="plszMsg.Type == 12 ? 'batch-div-active' : ''"
>
<div flex="main:center" @click="ClearSelect(12)" :class="plszMsg.Type == 12 ? 'batch-div-active' : ''">
供应商
</div>
<div
flex="main:center"
@click="ClearSelect(13)"
:class="plszMsg.Type == 13 ? 'batch-div-active' : ''"
>
<div flex="main:center" @click="ClearSelect(13)" :class="plszMsg.Type == 13 ? 'batch-div-active' : ''">
加入分销
</div>
</div>
<div class="batch-box-right">
<el-form
class="app-batch"
:model="addMsg"
:rules="rules"
ref="addMsg"
label-width="100px"
>
<el-form class="app-batch" :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-form-item v-if="plszMsg.Type == 7" label="运费设置">
<el-tag
v-if="ruleSelect.RulesName"
@close="(plszMsg.FreightId = 0), (ruleSelect = {})"
closable
>
{{ ruleSelect.RulesName }}</el-tag
>
<el-button
@click="chooseyfDig = true"
style="margin-left: 10px"
size="small"
>选择运费</el-button
>
<el-tag v-if="ruleSelect.RulesName" @close="(plszMsg.FreightId = 0), (ruleSelect = {})" closable>
{{ ruleSelect.RulesName }}</el-tag>
<el-button @click="chooseyfDig = true" style="margin-left: 10px" size="small">选择运费</el-button>
</el-form-item>
<el-form-item v-if="plszMsg.Type == 8" label="每人限购">
<el-form-item label-width="50px" label="商品">
<el-input
:disabled="BuyGoodsNumState"
v-model="plszMsg.LimitBuyGoodsNum"
style="width: 254px; margin-left: 15px"
type="number"
min="1"
size="small"
placeholder="请输入内容"
class="input-with-select"
>
<el-input :disabled="BuyGoodsNumState" v-model="plszMsg.LimitBuyGoodsNum"
style="width: 254px; margin-left: 15px" type="number" min="1" size="small" placeholder="请输入内容"
class="input-with-select">
<el-button slot="append">件</el-button>
</el-input>
<el-checkbox
@change="goodChange(BuyGoodsNumState, 1)"
style="margin-left: 10px"
v-model="BuyGoodsNumState"
>不限制</el-checkbox
>
<el-checkbox @change="goodChange(BuyGoodsNumState, 1)" style="margin-left: 10px"
v-model="BuyGoodsNumState">不限制</el-checkbox>
</el-form-item>
<el-form-item label-width="50px" label="订单">
<el-input
:disabled="BuyOrderNumState"
v-model="plszMsg.LimitBuyOrderNum"
style="width: 254px; margin-left: 15px"
type="number"
min="1"
size="small"
placeholder="请输入内容"
class="input-with-select"
>
<el-input :disabled="BuyOrderNumState" v-model="plszMsg.LimitBuyOrderNum"
style="width: 254px; margin-left: 15px" type="number" min="1" size="small" placeholder="请输入内容"
class="input-with-select">
<el-button slot="append">单</el-button>
</el-input>
<el-checkbox
@change="goodChange(BuyOrderNumState, 2)"
style="margin-left: 10px"
v-model="BuyOrderNumState"
>不限制</el-checkbox
>
<el-checkbox @change="goodChange(BuyOrderNumState, 2)" style="margin-left: 10px"
v-model="BuyOrderNumState">不限制</el-checkbox>
</el-form-item>
</el-form-item>
<template v-if="plszMsg.Type == 9">
<el-form-item label="积分赠送">
<el-tooltip
class="item"
effect="dark"
placement="top"
style="position: absolute; left: -10px; top: 12px"
>
<el-tooltip class="item" effect="dark" placement="top"
style="position: absolute; left: -10px; top: 12px">
<div slot="content">
用户购物赠送的积分, 如果不填写或填写0，则默认为不赠送积分<br />
如果为百分比则为按成交价格的比例计算积分<br />
......@@ -653,138 +366,57 @@
</div>
<i class="el-tooltip el-icon-info"></i>
</el-tooltip>
<el-input
v-model="plszMsg.IntegralPresent"
style="width: 670px; margin-left: 15px"
type="number"
min="1"
size="small"
placeholder="请输入内容"
class="input-with-select"
>
<el-input v-model="plszMsg.IntegralPresent" style="width: 670px; margin-left: 15px" type="number"
min="1" size="small" placeholder="请输入内容" class="input-with-select">
<el-button slot="append">
分
<el-radio v-model="plszMsg.IntegralPresentType" :label="2"
>固定值</el-radio
>
<el-radio v-model="plszMsg.IntegralPresentType" :label="1"
>百分比</el-radio
>
<el-radio v-model="plszMsg.IntegralPresentType" :label="2">固定值</el-radio>
<el-radio v-model="plszMsg.IntegralPresentType" :label="1">百分比</el-radio>
</el-button>
</el-input>
</el-form-item>
<el-form-item label="积分抵扣">
<el-tooltip
class="item"
effect="dark"
content="如果设置0，则不支持积分抵扣 如果带%则为按成交价格的比例计算抵扣多少元"
placement="top"
style="position: absolute; left: -10px; top: 12px"
>
<el-tooltip class="item" effect="dark" content="如果设置0，则不支持积分抵扣 如果带%则为按成交价格的比例计算抵扣多少元" placement="top"
style="position: absolute; left: -10px; top: 12px">
<i class="el-tooltip el-icon-info"></i>
</el-tooltip>
<el-input
v-model="plszMsg.PointsDeduction"
style="width: 670px; margin-left: 15px"
type="number"
min="1"
size="small"
placeholder="请输入内容"
class="input-with-select"
>
<el-input v-model="plszMsg.PointsDeduction" style="width: 670px; margin-left: 15px" type="number"
min="1" size="small" placeholder="请输入内容" class="input-with-select">
<template slot="prepend">最多抵扣</template>
<el-button slot="append">
分
<el-radio v-model="plszMsg.PointsDeductionType" :label="2"
>固定值</el-radio
>
<el-radio v-model="plszMsg.PointsDeductionType" :label="1"
>百分比</el-radio
>
<el-radio v-model="plszMsg.PointsDeductionType" :label="2">固定值</el-radio>
<el-radio v-model="plszMsg.PointsDeductionType" :label="1">百分比</el-radio>
</el-button>
</el-input>
</el-form-item>
<el-form-item label-width="110px">
<el-checkbox
v-model="plszMsg.IsMultipleDeduction"
:true-label="1"
:false-label="2"
>允许多件抵扣</el-checkbox
>
<el-checkbox v-model="plszMsg.IsMultipleDeduction" :true-label="1" :false-label="2">允许多件抵扣</el-checkbox>
</el-form-item>
</template>
<el-form-item
v-if="plszMsg.Type == 10"
label-width="160px"
label="是否加入快速购买"
>
<el-switch
v-model="plszMsg.IsQuickBuy"
active-color="#409EFF"
:active-value="1"
:inactive-value="0"
>
<el-form-item v-if="plszMsg.Type == 10" label-width="160px" label="是否加入快速购买">
<el-switch v-model="plszMsg.IsQuickBuy" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch>
</el-form-item>
<el-form-item
class="spmy"
v-if="plszMsg.Type == 11"
label-width="160px"
label="是否加入商品面议"
>
<el-tooltip
class="item"
effect="dark"
content="如果开启面议，则商品无法在线支付"
placement="top"
style="position: absolute; left: -22px; top: 12px"
>
<el-form-item class="spmy" v-if="plszMsg.Type == 11" label-width="160px" label="是否加入商品面议">
<el-tooltip class="item" effect="dark" content="如果开启面议，则商品无法在线支付" placement="top"
style="position: absolute; left: -22px; top: 12px">
<i class="el-tooltip el-icon-info"></i>
</el-tooltip>
<el-switch
v-model="plszMsg.IsGoodsNegotiable"
active-color="#409EFF"
:active-value="1"
:inactive-value="0"
>
<el-switch v-model="plszMsg.IsGoodsNegotiable" active-color="#409EFF" :active-value="1"
:inactive-value="0">
</el-switch>
</el-form-item>
<el-form-item
class="spmy"
v-if="plszMsg.Type == 12"
label-width="160px"
label="供应商"
>
<el-select
class="w150"
style="margin-right: 10px"
v-model="plszMsg.SupplierId"
size="small"
placeholder="请选择"
@change="changeSupplier"
>
<el-option
v-for="item in options"
:key="item.ID"
:label="item.Name"
:value="item.ID"
>
<el-form-item class="spmy" v-if="plszMsg.Type == 12" label-width="160px" label="供应商">
<el-select class="w150" style="margin-right: 10px" v-model="plszMsg.SupplierId" size="small"
placeholder="请选择" @change="changeSupplier">
<el-option v-for="item in options" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item
class="spmy"
v-if="plszMsg.Type == 13"
label-width="160px"
label="是否加入分销平台"
>
<el-switch
v-model="plszMsg.RetailStore"
active-text="是"
:active-value="2"
inactive-text="否"
:inactive-value="1"
>
<el-form-item class="spmy" v-if="plszMsg.Type == 13" label-width="160px" label="是否加入分销平台">
<el-switch v-model="plszMsg.RetailStore" active-text="是" :active-value="2" inactive-text="否"
:inactive-value="1">
</el-switch>
</el-form-item>
</el-form>
......@@ -792,51 +424,30 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="plDig = false">取 消</el-button>
<el-button @click="plsetOk" size="small" type="primary"
>确 定</el-button
>
<el-button @click="plsetOk" size="small" type="primary">确 定</el-button>
</span>
</el-dialog>
<!-- 选择运费 -->
<el-dialog
title="选择运费"
top="2%"
:modal="false"
:modal-append-to-body="false"
:visible.sync="chooseyfDig"
width="25%"
>
<el-dialog title="选择运费" top="2%" :modal="false" :modal-append-to-body="false" :visible.sync="chooseyfDig"
width="25%">
<div>
<el-radio-group v-model="val">
<el-radio
@change="YfSelect"
class="yfradio"
v-for="(item, index) in ruleList"
:key="index"
:label="item"
>
{{ item.RulesName }}</el-radio
>
<el-radio @change="YfSelect" class="yfradio" v-for="(item, index) in ruleList" :key="index" :label="item">
{{ item.RulesName }}</el-radio>
</el-radio-group>
</div>
<span slot="footer" class="dialog-footer">
<el-button
size="small"
@click="
<el-button size="small" @click="
(chooseyfDig = false), (ruleSelect = {}), (plszMsg.FreightId = 0)
"
>取 消</el-button
>
<el-button size="small" @click="chooseyfDig = false" type="primary"
>确 定</el-button
>
">取 消</el-button>
<el-button size="small" @click="chooseyfDig = false" type="primary">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
export default {
export default {
name: "quickBuy",
data() {
return {
......@@ -858,7 +469,8 @@ export default {
StartTime: "",
EndTime: "",
OrderBy: 0,
Q_GoodsEduType: 1
Q_GoodsEduType: 1,
MaterialId:"",
},
total: 0,
tableData: [],
......@@ -873,20 +485,16 @@ export default {
UpdateType: 1
},
rules: {
CategoryIdNew: [
{
CategoryIdNew: [{
required: true,
message: "分类不能为空",
trigger: "change"
}
],
Sort: [
{
}],
Sort: [{
required: true,
message: "请输入排序",
trigger: "blur"
}
]
}]
},
fenleiData: [],
checkList: [],
......@@ -916,7 +524,7 @@ export default {
hpState: 0,
FxState: 0,
currentUserInfo: {
IsKorea:0
IsKorea: 0
} //当前用户
};
},
......@@ -1155,8 +763,7 @@ export default {
})
.then(() => {
this.i_post(
"/api/product/DelProcudtGoodsInfo",
{
"/api/product/DelProcudtGoodsInfo", {
GoodsId: item.Id
},
res => {
......@@ -1304,10 +911,10 @@ export default {
that.getFxState();
that.getSupplierList(); //获取供应商
}
window.addEventListener("message", function(messageEvent) {
let data = messageEvent.data||'';
window.addEventListener("message", function (messageEvent) {
let data = messageEvent.data || '';
console.log("收到vue的数据：", data);
if(data.indexOf('token')>-1){
if (data.indexOf('token') > -1) {
window.localStorage.setItem("iframeData", data);
}
that.getList();
......@@ -1319,105 +926,107 @@ export default {
});
}
};
};
</script>
<style>
.plxg .spmy .el-form-item__label {
.plxg .spmy .el-form-item__label {
padding-right: 26px;
}
}
.yfradio {
.yfradio {
display: block;
padding: 10px;
}
}
.plxg .batch-div-active {
.plxg .batch-div-active {
background-color: #e2e2e2;
}
}
.plxg .batch-box-left div {
.plxg .batch-box-left div {
padding: 5px 0;
margin: 5px 0;
cursor: pointer;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
}
.plxg .batch-box-left {
.plxg .batch-box-left {
width: 120px;
border-right: 1px solid #e2e2e2;
padding: 0 20px;
}
}
.plxg .el-dialog__body {
.plxg .el-dialog__body {
padding-top: 10px !important;
}
}
.plxg .absoSpan {
.plxg .absoSpan {
position: absolute;
top: 22px;
left: 100px;
}
}
.app-add-cat .el-checkbox-group {
.app-add-cat .el-checkbox-group {
font-size: 14px !important;
}
}
.app-add-cat .el-checkbox {
.app-add-cat .el-checkbox {
margin-right: 0;
}
}
.app-add-cat .el-dialog__body {
.app-add-cat .el-dialog__body {
padding: 10px 20px !important;
}
}
.app-add-cat .tag-box .tag-item {
.app-add-cat .tag-box .tag-item {
margin-right: 5px;
}
}
.app-add-cat .tag-box {
.app-add-cat .tag-box {
margin: 20px 0;
}
}
.app-add-cat .app-goods-cat-list .active {
.app-add-cat .app-goods-cat-list .active {
background: #fafafa;
}
}
.app-add-cat .app-goods-cat-list .cat-item {
.app-add-cat .app-goods-cat-list .cat-item {
cursor: pointer;
padding: 5px 10px;
}
}
.app-add-cat .app-goods-cat-list {
.app-add-cat .app-goods-cat-list {
border: 1px solid #e8eaee;
border-radius: 5px;
margin-top: -5px;
padding: 10px 0;
overflow: scroll;
height: 400px;
}
}
.goodsList {
.goodsList {
padding: 20px;
}
}
.goodsList .vue-line-clamp {
.goodsList .vue-line-clamp {
display: block;
display: -webkit-box;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
}
}
.goodsList .content {
.goodsList .content {
background: #fff;
margin-top: 10px;
box-sizing: border-box;
}
}
.goodsList .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
.goodsList .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
background-color: #409eff;
border-color: #409eff;
}
}
</style>
src/components/coffeeManage/orderList.vue
View file @ 9f730dbd
......@@ -58,8 +58,8 @@
<el-option label="资产类" :value="2"></el-option>
<el-option label="教室类" :value="3"></el-option>
</el-select>
<el-checkbox v-model="IsSelectPayMoney" true-label="1" false-label="0"
style="margin-left: 15px;font-size:14px" @change="(msg.pageIndex = 1), getList()">只看已付款</el-checkbox>
<el-checkbox v-model="IsSelectPayMoney" true-label="1" false-label="0" style="margin-left: 15px;font-size:14px"
@change="(msg.pageIndex = 1), getList()">只看已付款</el-checkbox>
</div>
<div style="
display: flex;
......@@ -80,7 +80,6 @@
clearable style="margin-top: 10px; width: 200px" class="input-with-select" placeholder="请输入主播名称"
v-model="msg.AnchorName" size="small">
</el-input> -->
</div>
<div style="
display: flex;
......@@ -526,11 +525,11 @@
<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="线下付款"
<!-- <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>
</el-tooltip> -->
</template>
<el-tooltip class="item" effect="dark" content="查看订单详情" placement="top">
......@@ -927,7 +926,7 @@
AnchorName: "",
IsSelectPayMoney: 0,
IsOffline: -1,
GoodsEduType:0,
GoodsEduType: 0,
},
IsSelectPayMoney: 0,
platList: [],
......@@ -1893,34 +1892,42 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = that.$loading({
lock: true,
text: '单据生成中...',
spinner: 'el-icon-loading',
});
that.i_post("/api/order/SetEduGoodsFreightCostFinance", {
OrderId: id
}, (res) => {
loading.close()
if (res.data.resultCode == 1) {
console.log(1884, res)
that.$message({
type: 'success',
message: '操作成功'
});
that.getList()
}
},()=>{
loading.close()
});
})
},
// 是否显示运费制单按钮
isShowzhidan(item){
const flag= item.DetailList.some(e=>{
return e.FreightFinanceId==0&&e.FreightCostMoney>0
isShowzhidan(item) {
const flag = item.DetailList.some(e => {
return e.FreightFinanceId == 0 && e.FreightCostMoney > 0
})
if(item.FreightMoney>0&&flag){
if (item.FreightMoney > 0 && flag) {
return true
}else{
} else {
return false
}
}
},
};
</script>
<style scoped>
......
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