diff --git a/pages/billing/addUser.vue b/pages/billing/addUser.vue
index 4e5e162..57e2fa6 100644
--- a/pages/billing/addUser.vue
+++ b/pages/billing/addUser.vue
@@ -53,8 +53,7 @@
address: '',
province: '',
city: '',
- area: '',
- id: ''
+ area: ''
},
// 单选数据源
sexs: [{
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 1a96e85..0d66b07 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -5,28 +5,44 @@
-
+
+
+ 点击列表可跳转至销售单
+
+
-
- -
-
- 销售员： {{item.createByName == null ?'暂无':item.createByName}}
- 营业额：
- {{item.realAmount == null ?'暂无':item.realAmount}}
- {{' 欠款： '}} {{item.noEarn == null ?'暂无':item.noEarn}}
-
-
- 订单状态：{{item.status == 0 ?'待抢单' :item.status == 1 ?'待取货':item.status == 2 ?'作废' :item.status == 3 ?'待送达' :item.status == 4 ?'已完成' :item.status == 5 ?'下游客户待退货' :item.status == 00 ?'退货待抢单' :item.status == 01 ?'退货待取货' :item.status == 03 ?'退货待送达' :item.status == 04 ?'待确认退货' :item.status == 6 ?'待配货' :'挂单'}}
-
- 去开单
- 删除订单
-
-
+
+ -
+
+
+
+
+
-
+
-
+
+
@@ -41,7 +57,8 @@
page: 1,
totalPages: 0,
// type:'',
- range:[]
+ range:[],
+ btnStatus:true
};
},
onLoad(options) {
@@ -125,6 +142,13 @@
url: '/pages/inventory/goodsList1'
})
},
+ //点击打印按钮
+ printCodeBtn(){
+ this.btnStatus = !this.btnStatus
+ },
+ // checkboxChange(e){
+ // console.log(JSON.parse(e.detail.value))
+ // },
delItemModal(item) {
let that = this;
@@ -173,6 +197,13 @@
}
.uni-searchbar{
padding: 20rpx 0 !important;
+ }
+ .dayin-text{
+ flex: 1;
+ text-align: right;
+ padding-right: 20rpx;
+ text-decoration: underline;
+ color: blue;
}
.ulList {
@@ -197,5 +228,21 @@
}
}
}
+ }
+ .order-bottom{
+ background: #fff;
+ height: 120rpx;
+ width: 100%;
+ position: fixed;
+ bottom:0;
+
+ button{
+ width: 90%;
+ height: 80rpx;
+ margin: 0 auto;
+ background: #088FEB;
+ color: #fff;
+ margin-top: 20rpx;
+ }
}
\ No newline at end of file
diff --git a/pages/index/peopleList.vue b/pages/index/peopleList.vue
index 9b58047..5fc8b64 100644
--- a/pages/index/peopleList.vue
+++ b/pages/index/peopleList.vue
@@ -76,7 +76,7 @@
-
+
{{item.companyName}}
@@ -188,7 +188,7 @@
} else {
this.popleList = [...this.popleList, ...res.result.content]
}
- this.totalPages = res.result.pages
+ this.totalPages = res.result.number
}else{
this.tui.toast(res.message)
}
@@ -319,7 +319,7 @@
} else {
this.popleList = [...this.popleList, ...res.result.content]
}
- this.totalPages = res.result.pages
+ this.totalPages = res.result.totalPages
}else{
this.tui.toast(res.message)
}
diff --git a/pages/inventory/gategory.vue b/pages/inventory/gategory.vue
index 6141a69..9cdfcdc 100644
--- a/pages/inventory/gategory.vue
+++ b/pages/inventory/gategory.vue
@@ -25,6 +25,38 @@
+
+
+
+
@@ -79,7 +111,139 @@
isOpenId: '',
delType: '',
goodsList: [],
- dialogTit: '输入分类名'
+ dialogTit: '输入分类名',
+ typeText:'',
+ defaultList:[{
+ name:'颜色',
+ list:[{
+ type:'白色',
+ checked:false,
+ },{
+ type:'黑色',
+ checked:false,
+ },{
+ type:'浅蓝',
+ checked:false,
+ },{
+ type:'蓝色',
+ checked:false,
+ },{
+ type:'灰色',
+ checked:false,
+ },{
+ type:'咖色',
+ checked:false,
+ },{
+ type:'紫色',
+ checked:false,
+ },{
+ type:'红色',
+ checked:false,
+ },{
+ type:'米色',
+ checked:false,
+ },{
+ type:'均色',
+ checked:false,
+ }]
+ },{
+ name:'通用尺码',
+ list:[{
+ type:'XS',
+ checked:false
+ },{
+ type:'S',
+ checked:false,
+ },{
+ type:'M',
+ checked:false,
+ },{
+ type:'L',
+ checked:false,
+ },{
+ type:'XL',
+ checked:false,
+ },{
+ type:'XXL',
+ checked:false,
+ },{
+ type:'XXXL',
+ checked:false,
+ },{
+ type:'XXXXL',
+ checked:false,
+ },{
+ type:'均码',
+ checked:false,
+ }]
+ },{
+ name:'尺码',
+ list:[{
+ type:'25码',
+ checked:false
+ },{
+ type:'26码',
+ checked:false
+ },{
+ type:'27码',
+ checked:false
+ },{
+ type:'28码',
+ checked:false
+ },{
+ type:'29码',
+ checked:false
+ },{
+ type:'30码',
+ checked:false
+ },{
+ type:'31码',
+ checked:false
+ },{
+ type:'32码',
+ checked:false
+ },{
+ type:'33码',
+ checked:false
+ },{
+ type:'34码',
+ checked:false
+ },{
+ type:'35码',
+ checked:false
+ },{
+ type:'36码',
+ checked:false
+ },{
+ type:'37码',
+ checked:false
+ },{
+ type:'38码',
+ checked:false
+ },{
+ type:'39码',
+ checked:false
+ },{
+ type:'40码',
+ checked:false
+ },{
+ type:'41码',
+ checked:false
+ },{
+ type:'42码',
+ checked:false
+ },{
+ type:'43码',
+ checked:false
+ },{
+ type:'44码',
+ checked:false
+ },{
+ type:'45码',
+ checked:false
+ }]
+ }],
+ multipleList:[]
}
},
computed: {
@@ -124,7 +288,7 @@
this.inputVal = '';
this.isOpenId = item;
this.dialogTit = '输入分类名'
- this.$refs.inputDialog.open()
+ this.$refs.addTypeDialog.open('bottom')
} else if (type == 'attrEdit') {
this.inputVal = item.attributeName;
this.editItem = item;
@@ -178,13 +342,6 @@
dialogInputConfirm(e) {
switch (this.typeModel) {
case 'add':
- if (e == "") {
- uni.showToast({
- title: "不能为空",
- icon: 'none'
- })
- return;
- }
for (let i = 0; i < this.indexList.length; i++) {
if (this.indexList[i].categoryName == e) {
uni.showToast({
@@ -193,24 +350,33 @@
})
return
}
- }
- this.tui.request("/app/productCategory/save", "post", {
- categoryName: e
- }, false, true).then((res) => {
- if (res.code == 200) {
- this.getGategoryList()
- uni.showToast({
- title: "添加成功",
- icon: 'none'
- })
- } else {
- uni.showToast({
- title: "添加失败",
- icon: 'none'
- })
- }
-
- }).catch((res) => {})
+ }
+ if(e != '' && this.multipleList == ''){
+ this.tui.request("/app/productCategory/save", "post", {
+ categoryName: e
+ }, false, true).then((res) => {
+ if (res.code == 200) {
+ this.tui.toast("添加成功")
+
+ setTimeout(res=> {
+ this.getGategoryList()
+ this.$refs.addTypeDialog.close()
+ },2000)
+ } else {
+ this.tui.toast("添加失败")
+ }
+
+ }).catch((res) => {})
+ }else if(e != '' && this.multipleList != ''){
+ this.tui.toast("暂无法使用")
+ setTimeout(res=> {
+ this.getGategoryList()
+ this.$refs.addTypeDialog.close()
+ },1000)
+ }else{
+ this.tui.toast("请选择分类后进行添加！")
+ }
+ this.$refs.addTypeDialog.val = ''
break;
case 'edit':
this.tui.request("/app/productCategory/edit", "post", {
@@ -276,7 +442,60 @@
uni.navigateTo({
url: '/pages/inventory/gategoryLow?id=' + id
})
- }
+ },
+ //选择多个规格保存
+ addMultipleType(item,item1,index){
+ console.log(item);
+ console.log(item1);
+ item.list[index].checked = !item.list[index].checked
+ var list = []
+ if(this.multipleList == ''){
+ console.log("首次");
+ list.push(item1)
+ var data = {
+ name:item.name,
+ list: list
+ }
+ this.multipleList.push(data)
+ }else{
+ for(var i=0;i
@@ -356,7 +575,10 @@
margin: 150rpx auto 0;
}
-
+ .checked{
+ background: #60F3FF;
+ color: #fff;
+ }
.card-list ul {}
.card-list li {
@@ -449,5 +671,69 @@
margin: 0 auto;
background: linear-gradient(90deg, #60F3FF, #088FEB);
border-radius: 70rpx;
+ }
+ .add-popup-content {
+ align-items: center;
+ justify-content: center;
+ padding: 15px;
+ width: 100%;
+ height: 1300rpx;
+ background-color: #fff;
+ }
+
+ .add-popup-title {
+ font-size: 36rpx;
+ font-weight: bold;
+ text-align: center;
+ position: relative;
+ }
+
+ .add-popup-container {
+ margin-top: 20rpx;
+ }
+
+ .add-popup-bottom {
+ display: flex;
+ height: 80rpx;
+ color: #fff;
+ line-height: 80rpx;
+ margin-top: 50rpx;
+ }
+
+ .add-popup-btn {
+ flex: 1;
+ text-align: center;
+ background: linear-gradient(90deg, #60F3FF, #088FEB);
+ }
+ .title-fur {
+ width: 95%;
+ height: 70rpx;
+ margin: 0 auto;
+ border-bottom: 1px solid #eee;
+ .name {
+ font-size: 30rpx;
+ width: 50%;
+ float: left;
+ height: 70rpx;
+ line-height: 70rpx;
+ }
+ }
+
+
+
+ .content-fur {
+ padding-bottom: 25rpx;
+ }
+
+ .content-low {
+ width: auto;
+ border: 1px solid #eee;
+ display: inline-block;
+ min-width: 90rpx;
+ padding: 5rpx;
+ font-size: 35rpx;
+ text-align: center;
+ color: #777;
+ margin: 20rpx 0 0 20rpx;
}
\ No newline at end of file
diff --git a/pages/inventory/gategoryLow.vue b/pages/inventory/gategoryLow.vue
index f53aedc..d1d839f 100644
--- a/pages/inventory/gategoryLow.vue
+++ b/pages/inventory/gategoryLow.vue
@@ -30,38 +30,6 @@
@confirm="dialogInputConfirm" @close="dialogClose">
-
-
-
-
-
+
+
+
+ 新增入库
+
+
+ 更多
+
-
- 新增入库
-
@@ -85,7 +92,23 @@
-
+
+
+
+
@@ -223,7 +246,7 @@
this.searchName = e.value
this.getShareList()
},
- //点击头部 分类管理 和 新增入库 按钮
+ //点击头部 更多 和 新增入库 按钮
onGridClick(target) {
if (target == '0') {
uni.navigateTo({
@@ -233,10 +256,16 @@
uni.navigateTo({
url: '/pages/inventory/addinventory'
})
- } else {
+ } else if (target == '2') {
uni.navigateTo({
url: "/pages/inventory/addGoods"
})
+ }else if(target == '3'){
+ this.$refs.payDialog.open('center')
+ }else{
+ uni.navigateTo({
+ url: "/pages/inventory/batchPrint"
+ })
}
}
},
@@ -434,5 +463,32 @@
line-height: 140rpx;
color: #777;
background: #eee;
+ }
+ .popup-pay-content {
+ align-items: center;
+ justify-content: center;
+ padding: 15px;
+ width: 500rpx;
+ height: auto;
+ background-color: #fff;
+ }
+
+ .popup-pay-title {
+ font-size: 36rpx;
+ font-weight: bold;
+ text-align: center;
+ position: relative;
+ }
+
+ .popup-pay-container {
+ margin-top: 20rpx;
+ height: 100rpx;
+ border-radius: 10px;
+ background: #088FEB;
+ line-height: 100rpx;
+ text-align: center;
+ border-bottom: 1px solid #eee;
+ border-top: 1px solid #eee;
+ color: #fff;
}
\ No newline at end of file