myTest383 4 months ago
parent
commit
4897a1dda4
  1. 13
      src/api/brand.js
  2. 3
      src/api/invoiceReview/invoiceReview.js
  3. BIN
      src/assets/home/bj_new.jpg
  4. 78
      src/views/appletBanner/appletBannerAdd.vue
  5. 25
      src/views/commodity/commodityAdd.vue
  6. 22
      src/views/login/login.vue
  7. 73
      src/views/orderreserve/index.vue
  8. 10
      src/views/pms/brand/components/BrandDetail.vue
  9. 151
      src/views/pms/brand/index.vue

13
src/api/brand.js

@ -13,6 +13,18 @@ export function createBrand(data) {
data: data
})
}
export function updateDelivery(data) {
return request({
url: '/pms/PmsBrand/update/delivery',
method: 'post',
params: data,
headers: {
'Content-Type': 'application/json'
}
})
}
export function updateShowStatus(data) {
return request({
url: '/pms/PmsBrand/update/showStatus',
@ -50,4 +62,3 @@ export function updateBrand(id,data) {
data: data
})
}

3
src/api/invoiceReview/invoiceReview.js

@ -14,7 +14,8 @@ export default {
// 获取订单详情
getOrderDetails: function(params) {
return request({
url: '/empsreservoorder/OrderDetailsNew/'+params,
// url: '/empsreservoorder/OrderDetailsNew/'+params,
url: '/order/OrderDetailsNew/' + params,
method: 'get'
})
},

BIN
src/assets/home/bj_new.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 374 KiB

78
src/views/appletBanner/appletBannerAdd.vue

@ -24,33 +24,29 @@
<div class="item" style="margin-bottom: 100px;margin-top: 100px;">
<span class="item_text">轮播图图片</span>
<upload
ref="uploadImg2"
v-model="imgList"
style="margin-top: 20px;"
class="item_input"
:limit="1"
bucket="map"
:class="{ hide: hideUploadBtn }"
:upload-data="{ type: '0001' }"
@change="backData"
/>
<upload ref="uploadImg2" v-model="imgList" style="margin-top: 20px;" class="item_input" :limit="1"
bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }"
@change="backData" />
</div>
<div class="item">
<span class="item_text">发布人</span>
<el-input v-model="formobj.publisher" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">发布日期</span>
<el-date-picker v-model="formobj.releaseTime" type="date" class="item_input" value-format="yyyy-MM-dd" placeholder="选择日期" />
<el-date-picker v-model="formobj.releaseTime" type="date" class="item_input"
value-format="yyyy-MM-dd" placeholder="选择日期" />
</div>
<div class="item">
<span class="item_text">时效开始日期</span>
<el-date-picker v-model="formobj.startDate" type="date" class="item_input" value-format="yyyy-MM-dd" placeholder="选择日期" />
<el-date-picker v-model="formobj.startDate" type="date" class="item_input" value-format="yyyy-MM-dd"
placeholder="选择日期" />
</div>
<div class="item">
<span class="item_text">时效结束日期</span>
<el-date-picker v-model="formobj.endDate" type="date" class="item_input" value-format="yyyy-MM-dd" placeholder="选择日期" />
<el-date-picker v-model="formobj.endDate" type="date" class="item_input" value-format="yyyy-MM-dd"
placeholder="选择日期" />
</div>
<!-- <div class="item2">
@ -62,21 +58,14 @@
<div class="item" style="margin-bottom: 100px;margin-top: 100px;">
<span class="item_text">内容图片</span>
<upload
ref="uploadImg3"
v-model="imgListnr"
style="margin-top: 20px;"
class="item_input"
:limit="1"
bucket="map"
:class="{ hide: hideUploadBtnNr }"
:upload-data="{ type: '0001' }"
@change="backDataNr"
/>
<upload ref="uploadImg3" v-model="imgListnr" style="margin-top: 20px;" class="item_input" :limit="1"
bucket="map" :class="{ hide: hideUploadBtnNr }" :upload-data="{ type: '0001' }"
@change="backDataNr" />
</div>
<div class="item2">
<span class="item_text">轮播图内容</span>
<editor class="item_input" :height="300" :min-height="100" :value="formobj.content" @input="editinput" />
<editor class="item_input" :height="300" :min-height="100" :value="formobj.content"
@input="editinput" />
</div>
</el-card>
@ -100,7 +89,7 @@
return {
imgList: [],
imgListnr: [],
hideUploadBtn: false,
hideUploadBtn: true,
hideUploadBtnNr: false,
submitdisabled: false,
formobj: {
@ -140,6 +129,10 @@
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.imgList = []
this.imgListnr = []
this.hideUploadBtn = true
this.hideUploadBtnNr = true
this.formobj = {
sid: '',
title: '',
@ -160,11 +153,30 @@
.then(resp => {
if (resp.success) {
this.formobj = resp.data
this.imgList[0].url = resp.data.bannerUrl
this.imgList = []
if (resp.data.bannerUrl != '') {
this.imgList.push({
url: resp.data.bannerUrl
})
}
this.hideUploadBtn = this.imgList.length != 0
this.imgListnr = []
if (resp.data.contentUrl != '') {
this.imgListnr.push({
url: resp.data.contentUrl
})
}
this.hideUploadBtnNr = this.imgListnr.length != 0
}
})
.catch(e => {
this.formobj = row
this.imgList = []
this.imgListnr = []
})
},
backData(value) {
@ -177,8 +189,8 @@
this.formobj.bannerUrl = ''
}
this.hideUploadBtn = this.imgList.length !== 0
console.log('this.hideUploadBtn', this.hideUploadBtn)
this.hideUploadBtn = this.imgList.length != 0
},
backDataNr(value) {
if (this.imgListnr.length > 0) {
@ -195,6 +207,12 @@
<style lang="scss" scoped>
//
::v-deep .hide {
.el-upload--picture-card {
display: none !important;
}
}
.box-card {
margin-left: 60px;
margin-right: 60px;

25
src/views/commodity/commodityAdd.vue

@ -45,11 +45,11 @@
oninput="value=value.replace(/[^0-9]/g,'')" />
</div>
<div class="item">
<span class="item_text"> (/)</span>
<span class="item_text">包装单</span>
<el-input v-model="formobj.price" placeholder="" class="item_input" clearable
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</div>
<div class="item">
<!-- <div class="item">
<span class="item_text">阶梯重量()</span>
<el-input v-model="formobj.stepWeight" placeholder="" class="item_input" clearable
oninput="value=value.replace(/[^0-9]/g,'')" />
@ -58,31 +58,30 @@
<span class="item_text">阶梯价格 (/)</span>
<el-input v-model="formobj.stepPrice" placeholder="" class="item_input" clearable
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</div>
</div> -->
<div class="item">
<span class="item_text">商品单位</span>
<el-input v-model="formobj.specificationUnit" placeholder="例如:斤/瓶/袋/箱/盒" class="item_input"
clearable />
<span class="item_text">金额单位</span>
<el-input v-model="formobj.specificationUnit" placeholder="例如:元" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">规格 (/)</span>
<span class="item_text">单价</span>
<el-input v-model="formobj.weight" placeholder="例如:30" class="item_input" clearable
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</div>
<div class="item">
<span class="item_text">规格单位</span>
<span class="item_text">基础单位</span>
<el-input v-model="formobj.unitName" placeholder="例如:份" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">规格描述</span>
<el-input v-model="formobj.remarks" placeholder="例如:一份30斤" class="item_input" clearable />
</div>
<div class="item">
<!-- <div class="item">
<span class="item_text">提货截止日</span>
<el-date-picker v-model="formobj.periodValidity" type="date" class="item_input"
value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
</div>
</div> -->
<div class="item">
<span class="item_text">商品简介</span>
<el-input v-model="formobj.content" placeholder="商品简介" class="item_input" clearable />
@ -138,7 +137,7 @@
stepWeight: '',
stepPrice: '',
unitName: '份',
specificationUnit: '',
specificationUnit: '',
weight: '',
remarks: '',
content: '',
@ -148,7 +147,7 @@
brandName: '',
categoryId: '',
categoryName: '',
periodValidity: ""
periodValidity: "2099-12-31"
},
brandList: [],
cateList: [],
@ -211,7 +210,7 @@
stepWeight: '',
stepPrice: '',
unitName: '份',
specificationUnit: '',
specificationUnit: '',
weight: '',
remarks: '',
content: '',

22
src/views/login/login.vue

@ -10,12 +10,13 @@
<el-form ref="loginForm" :model="loginForm" class="login-form">
<h3 class="title1">用户登录</h3>
<el-form-item>
<el-input v-model="loginForm.userName" autocomplete="off" placeholder="请输入账号" prefix-icon="el-icon-user">
<el-input v-model="loginForm.userName" autocomplete="off" placeholder="请输入账号"
prefix-icon="el-icon-user">
</el-input>
</el-form-item>
<el-form-item>
<el-input v-model="loginForm.password" autocomplete="off" placeholder="请输入密码" prefix-icon="el-icon-lock"
show-password>
<el-input v-model="loginForm.password" autocomplete="off" placeholder="请输入密码"
prefix-icon="el-icon-lock" show-password>
</el-input>
<!-- <span class="nopsw register" @click="forgetPwd = true">忘记密码 </span> -->
</el-form-item>
@ -119,8 +120,7 @@
window.sessionStorage.setItem('userName', user.userName)
}
}).catch(() => {
})
}).catch(() => {})
},
codeShow() {
@ -145,7 +145,7 @@
width: 100%;
height: 100%;
background-size: 100% 100%;
background-image: url(../../assets/home/bj.jpg);
background-image: url(../../assets/home/bj_new.jpg);
background-position: center;
overflow: hidden;
@ -234,7 +234,7 @@
}
.register {
color: #EE640C;
color: #155B2D;
}
.register:hover,
@ -247,23 +247,23 @@
}
.text-danger {
color: #f56c6c;
color: #57B545;
}
.login-btn {
margin: 10px 0 10px 0;
width: 100%;
background-color: #EE640C;
background-color: #57B545;
border: 0;
}
.login-btn:hover {
background-color: #EE640C;
background-color: #155B2D;
border: 0;
}
.el-input--prefix .el-input__inner {
border: 1px solid #EE640C;
border: 1px solid #57B545;
background: transparent;
color: #333 !important;
}

73
src/views/orderreserve/index.vue

@ -9,13 +9,27 @@
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="预约开始日期">
<el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
<el-form-item label="预约日期">
<el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
<el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
</el-form-item>
<el-form-item label="预约结束日期">
<el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
<el-form-item label="收货地址">
<el-input v-model="page.params.userAddress" placeholder="" clearable />
</el-form-item>
<el-form-item label="客户名称">
<el-input v-model="page.params.userName" placeholder="" clearable />
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="page.params.userPhone" placeholder="" clearable />
</el-form-item>
<el-form-item label="所属支行">
<el-form-item label="商品名称">
<el-input v-model="page.params.goodsName" placeholder="" clearable />
</el-form-item>
<!-- <el-form-item label="所属支行">
<el-select v-model="page.params.bankSid" filterable class="item_input" clearable placeholder="请选择" style="width:100%" @change="bankSelect">
<el-option v-for="item in bankList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
@ -29,11 +43,13 @@
<el-select v-model="page.params.cardType" filterable class="item_input" clearable placeholder="请选择" style="width:100%">
<el-option v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-form-item> -->
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" size="small" icon="el-icon-search"
@click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh"
@click="resetQuery">重置</el-button>
</div>
</div>
</div>
@ -53,21 +69,26 @@
</template>
</el-table-column> -->
<el-table-column prop="reserveDate" label="预约日期" align="center" />
<el-table-column prop="bankName" label="所属支行" align="center" />
<el-table-column prop="storeName" label="提货点" align="center" />
<el-table-column prop="brandName" label="菜窖分类" align="center" />
<el-table-column prop="userName" label="用户名称" align="center" />
<!-- <el-table-column prop="bankName" label="所属支行" align="center" /> -->
<!-- <el-table-column prop="storeName" label="提货点" align="center" />
<el-table-column prop="brandName" label="菜窖分类" align="center" /> -->
<el-table-column prop="userAddress" label="收货地址" align="left" header-align="center"
width="400" />
<el-table-column prop="userName" label="客户名称" align="center" />
<el-table-column prop="userPhone" label="联系电话" align="center" />
<el-table-column prop="goodsName" label="商品名称" align="center" />
<el-table-column prop="goodsNumber" label="商品数量" align="center" />
<el-table-column prop="customerBank" label="客户所属支行" align="center" />
<el-table-column prop="goodsName" label="商品名称" align="left" header-align="center" width="250" />
<el-table-column prop="gg" label="商品规格" align="center" />
<el-table-column prop="remarks" label="包装规格" align="center" />
<el-table-column prop="goodsNumber" label="数量(份)" align="center" />
<!-- <el-table-column prop="customerBank" label="客户所属支行" align="center" /> -->
</el-table>
</div>
<!-- End 项目列表 -->
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current" :limit.sync="page.size" class="pagination" @pagination="loadList" />
<pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
:limit.sync="page.size" class="pagination" @pagination="loadList" />
</div>
</div>
</div>
@ -121,9 +142,10 @@
params: {
startDate: '',
endDate: '',
store: '',
bankSid: '',
cardType: ''
userAddress: '',
userName: '',
userPhone: '',
goodsName: '',
}
},
brandList: [],
@ -135,9 +157,9 @@
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.initBank()
this.initStore()
this.initBrand()
// this.initBank()
// this.initStore()
// this.initBrand()
// this.getAllStore()
// this.loadList()
// this.getBankList()
@ -224,9 +246,10 @@
params: {
startDate: '',
endDate: '',
store: '',
bankSid: '',
cardType: ''
userAddress: '',
userName: '',
userPhone: '',
goodsName: '',
}
}
this.loadList()

10
src/views/pms/brand/components/BrandDetail.vue

@ -20,18 +20,24 @@
<el-form-item label="排序:" prop="sort">
<el-input v-model.number="brand.sort" />
</el-form-item>
<el-form-item label="是否配送:">
<el-radio-group v-model="brand.delivery">
<el-radio :label="'1'">配送</el-radio>
<el-radio :label="'0'">不配送</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否显示:">
<el-radio-group v-model="brand.showStatus">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="品牌制造商:">
<!-- <el-form-item label="品牌制造商:">
<el-radio-group v-model="brand.factoryStatus">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-form-item> -->
<el-form-item label="起始销售数量:">
<el-input v-model="brand.qssl" />
</el-form-item>

151
src/views/pms/brand/index.vue

@ -5,12 +5,7 @@
<div>
<i class="el-icon-search" />
<span>筛选搜索</span>
<el-button
style="float: right"
type="primary"
size="small"
@click="searchBrandList()"
>
<el-button style="float: right" type="primary" size="small" @click="searchBrandList()">
查询结果
</el-button>
</div>
@ -25,23 +20,13 @@
<el-card class="operate-container" shadow="never">
<i class="el-icon-tickets" />
<span>数据列表</span>
<el-button
class="btn-add"
size="mini"
@click="addBrand()"
>
<el-button class="btn-add" size="mini" @click="addBrand()">
添加
</el-button>
</el-card>
<div class="table-container">
<el-table
ref="brandTable"
v-loading="listLoading"
:data="list"
style="width: 100%"
border
@selection-change="handleSelectionChange"
>
<el-table ref="brandTable" v-loading="listLoading" :data="list" style="width: 100%" border
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="60" align="center" />
<el-table-column label="编号" width="100" align="center">
<template slot-scope="scope">{{ scope.row.id }}</template>
@ -49,107 +34,77 @@
<el-table-column label="品牌名称" align="center">
<template slot-scope="scope">{{ scope.row.name }}</template>
</el-table-column>
<el-table-column label="品牌首字母" width="100" align="center">
<el-table-column label="品牌首字母" width="150" align="center">
<template slot-scope="scope">{{ scope.row.firstLetter }}</template>
</el-table-column>
<el-table-column label="排序" width="100" align="center">
<template slot-scope="scope">{{ scope.row.sort }}</template>
</el-table-column>
<el-table-column label="品牌制造商" width="100" align="center">
<el-table-column label="是否配送" width="180" align="center">
<template slot-scope="scope">
<el-switch
v-model="scope.row.factoryStatus"
:active-value="1"
:inactive-value="0"
@change="handleFactoryStatusChange(scope.$index, scope.row)"
/>
<el-switch v-model="scope.row.delivery" active-text="配送" inactive-text="不配送"
:active-value="'1'" :inactive-value="'0'"
@change="handleDeliveryChange(scope.$index, scope.row)" />
</template>
</el-table-column>
<!-- <el-table-column label="品牌制造商" width="150" align="center">
<template slot-scope="scope">
<el-switch v-model="scope.row.factoryStatus" :active-value="1" :inactive-value="0"
@change="handleFactoryStatusChange(scope.$index, scope.row)" />
</template>
</el-table-column> -->
<el-table-column label="是否显示" width="100" align="center">
<template slot-scope="scope">
<el-switch
v-model="scope.row.showStatus"
:active-value="1"
:inactive-value="0"
@change="handleShowStatusChange(scope.$index, scope.row)"
/>
<el-switch v-model="scope.row.showStatus" :active-value="1" :inactive-value="0"
@change="handleShowStatusChange(scope.$index, scope.row)" />
</template>
</el-table-column>
<el-table-column label="相关" width="220" align="center">
<template slot-scope="scope">
<span>商品</span>
<el-button
size="mini"
type="text"
@click="getProductList(scope.$index, scope.row)"
>100
<el-button size="mini" type="text" @click="getProductList(scope.$index, scope.row)">100
</el-button>
<span>评价</span>
<el-button
size="mini"
type="text"
@click="getProductCommentList(scope.$index, scope.row)"
>1000
<el-button size="mini" type="text"
@click="getProductCommentList(scope.$index, scope.row)">1000
</el-button>
</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center">
<template slot-scope="scope">
<el-button
size="mini"
@click="handleUpdate(scope.$index, scope.row)"
>编辑
<el-button size="mini" @click="handleUpdate(scope.$index, scope.row)">编辑
</el-button>
<el-button
size="mini"
type="danger"
@click="handleDelete(scope.$index, scope.row)"
>删除
<el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="batch-operate-container">
<el-select
v-model="operateType"
size="small"
placeholder="批量操作"
>
<el-option
v-for="item in operates"
:key="item.value"
:label="item.label"
:value="item.value"
/>
<!-- <div class="batch-operate-container">
<el-select v-model="operateType" size="small" placeholder="批量操作">
<el-option v-for="item in operates" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
<el-button
style="margin-left: 20px"
class="search-button"
type="primary"
size="small"
@click="handleBatchOperate()"
>
<el-button style="margin-left: 20px" class="search-button" type="primary" size="small"
@click="handleBatchOperate()">
确定
</el-button>
</div>
</div> -->
<div class="pagination-container">
<el-pagination
background
layout="total, sizes,prev, pager, next,jumper"
:page-size="listQuery.pageSize"
:page-sizes="[5,10,15]"
:current-page.sync="listQuery.pageNum"
:total="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
<el-pagination background layout="total, sizes,prev, pager, next,jumper" :page-size="listQuery.pageSize"
:page-sizes="[5,10,15]" :current-page.sync="listQuery.pageNum" :total="total"
@size-change="handleSizeChange" @current-change="handleCurrentChange" />
</div>
</div>
</div>
</template>
<script>
import { fetchList, updateShowStatus, updateFactoryStatus, deleteBrand } from '@/api/brand'
import {
fetchList,
updateDelivery,
updateShowStatus,
updateFactoryStatus,
deleteBrand
} from '@/api/brand'
export default {
name: 'BrandList',
@ -188,7 +143,12 @@
this.multipleSelection = val
},
handleUpdate(index, row) {
this.$router.push({ path: '/pms/updateBrand', query: { id: row.id }})
this.$router.push({
path: '/pms/updateBrand',
query: {
id: row.id
}
})
},
handleDelete(index, row) {
this.$confirm('是否要删除该品牌', '提示', {
@ -212,6 +172,24 @@
getProductCommentList(index, row) {
console.log(index, row)
},
handleDeliveryChange(index, row) {
var data = new URLSearchParams()
data.append('ids', row.id)
data.append('delivery', row.delivery)
updateDelivery(data).then(response => {
this.$message({
message: '修改成功',
type: 'success',
duration: 1000
})
}).catch(error => {
if (row.delivery === 0) {
row.delivery = 1
} else {
row.delivery = 0
}
})
},
handleFactoryStatusChange(index, row) {
var data = new URLSearchParams()
data.append('ids', row.id)
@ -302,7 +280,9 @@
})
},
addBrand() {
this.$router.push({ path: '/pms/addBrand' })
this.$router.push({
path: '/pms/addBrand'
})
}
}
}
@ -310,4 +290,3 @@
<style rel="stylesheet/scss" lang="scss" scoped>
</style>

Loading…
Cancel
Save