diff --git a/package1/AI/AIHangOrderList.vue b/package1/AI/AIHangOrderList.vue
index 383ef53..59b3c43 100644
--- a/package1/AI/AIHangOrderList.vue
+++ b/package1/AI/AIHangOrderList.vue
@@ -49,9 +49,9 @@
挂单列表
-
- AI
- 扫
+
+ 扫
+ AI
@@ -62,13 +62,18 @@
识别中...
+
+
+ {{item.aiFlag == 2?'识别成功':item.aiFlag == 3?'识别失败':''}}
+
+
语音备注
扫码选货
- 去开单
+ 去开单
删除
@@ -280,7 +285,12 @@
onShow() {
this.khName = JSON.parse(JSON.stringify(this.khName)) || ''
if(uni.getStorageSync('hangOrderType') == 'scanCode'){
- this.addReg()
+ if(this.khName != ''){
+ this.addReg()
+ }
+ uni.removeStorageSync('hangOrderType')
+ return;
+ }else if(uni.getStorageSync('hangOrderType') == 'changeGoods'){
uni.removeStorageSync('hangOrderType')
return;
}
@@ -318,6 +328,7 @@
}).catch((res) => {
this.tui.toast(res)
})
+ uni.stopPullDownRefresh()
},
addReg() {
this.tui.request("/app/sale/saveOrder", "POST", {
@@ -378,7 +389,7 @@
}else if(that.voiceText == null){
that.voiceText = res.result
}else{
- res.result = '\n' + res.result
+ res.result = ' ' + res.result
that.voiceText += res.result
}
}
@@ -396,6 +407,7 @@
//扫一扫功能
scanCodeAdd(item) {
let that = this;
+ uni.setStorageSync('hangOrderType','changeGoods')
uni.scanCode({
success: (res) => {
that.hangId = item.id
@@ -604,6 +616,7 @@
productCount: this.zNum,
discountAmount: this.purchasePrice,
unitPrice:this.purchasePrice,
+ categoryId:this.goodsDetail.categoryId,
productName: this.goodsDetail.productName,
productSn: this.goodsDetail.productSn,
productPicture: this.goodsDetail.productPicture,
@@ -698,58 +711,95 @@
}
})
},
+ goGoods(item){
+ var that = this;
+ if(item.aiNotRecognition != '' && item.aiNotRecognition != null){
+ uni.showModal({
+ title: "提示",
+ content: item.aiNotRecognition + '确认去开单吗?',
+ success: function(res) {
+ if (res.confirm) {
+ that.goSaleGoods(item)
+ }
+ }
+ })
+ }else if(item.aiNotRecognition == '' && item.saleDetailDTOList == null){
+ uni.showModal({
+ title: "提示",
+ content: '未识别到商品,确认去开单吗?',
+ success: function(res) {
+ if (res.confirm) {
+ that.goSaleGoods(item)
+ }
+ }
+ })
+ }else{
+ that.goSaleGoods(item)
+ }
+
+ },
//带参数跳转到开单页
goSaleGoods(item) {
let dataList = []
- if(item.aiNotRecognition != ''){
- this.tui.toast(item.aiNotRecognition)
- }
- setTimeout(res => {
- if(item.saleDetailDTOList){
- for (let i = 0; i < item.saleDetailDTOList.length; i++) {
- let obj = {}
- obj.saleDetailQueryDTO = item.saleDetailDTOList[i].stockLogList1
- obj.num = 0
- obj.id = item.saleDetailDTOList[i].productId
- obj.price = item.saleDetailDTOList[i].price
- obj.lsprice = item.saleDetailDTOList[i].price
- obj.zPrice = item.saleDetailDTOList[i].discountAmount
- obj.unitPrice = item.saleDetailDTOList[i].discountAmount
- obj.productName = item.saleDetailDTOList[i].productName
- obj.productPicture = item.saleDetailDTOList[i].productPicture+'?time='+new Date().getTime()
- obj.productSn = item.saleDetailDTOList[i].productSn
- obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice
- obj.saleId = item.id
- obj.remark = item.remark
- obj.xsyId = item.createBy
- obj.createByName = item.createByName
- dataList.push(obj)
- }
- }else{
+ if(item.saleDetailDTOList){
+ for (let i = 0; i < item.saleDetailDTOList.length; i++) {
+
let obj = {}
+ let attrMap = new Map()
+ let newSaleDetailDTOList = []
+ for(let m = 0; m < item.saleDetailDTOList[i].stockLogList1.length; m++){
+ if(attrMap.has(item.saleDetailDTOList[i].stockLogList1[m].attributeList) == true){
+ let hasCount = attrMap.get(item.saleDetailDTOList[i].stockLogList1[m].attributeList)
+ let trueCount = hasCount.split('-')[0]
+ let lastConut = Number(trueCount) + Number(item.saleDetailDTOList[i].stockLogList1[m].productCount)
+ newSaleDetailDTOList[hasCount.split('-')[1]].productCount = lastConut
+ }else{
+ newSaleDetailDTOList.push(item.saleDetailDTOList[i].stockLogList1[m])
+ attrMap.set(item.saleDetailDTOList[i].stockLogList1[m].attributeList,item.saleDetailDTOList[i].stockLogList1[m].productCount+'-'+m)
+ }
+ }
+ obj.saleDetailQueryDTO = newSaleDetailDTOList
obj.num = 0
- obj.price = 0
+ obj.id = item.saleDetailDTOList[i].productId
+ obj.price = item.saleDetailDTOList[i].price
+ obj.lsprice = item.saleDetailDTOList[i].price
+ obj.categoryId=item.saleDetailDTOList[i].categoryId
+ obj.zPrice = item.saleDetailDTOList[i].discountAmount
+ obj.unitPrice = item.saleDetailDTOList[i].discountAmount || item.saleDetailDTOList[i].wholesalePrice
+ obj.productName = item.saleDetailDTOList[i].productName
+ obj.productPicture = item.saleDetailDTOList[i].productPicture+'?time='+new Date().getTime()
+ obj.productSn = item.saleDetailDTOList[i].productSn
+ obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice
obj.saleId = item.id
obj.remark = item.remark
obj.xsyId = item.createBy
obj.createByName = item.createByName
dataList.push(obj)
}
- let khName = {
- name:item.userName,
- id:item.userId,
- area:item.area,
- city:item.city,
- address:item.receiveAddress,
- province:item.province,
- }
- uni.setStorageSync('carList1', JSON.stringify(dataList))
- uni.setStorageSync('khName', JSON.stringify(khName))
- uni.setStorageSync('hangOrder', true)
- uni.switchTab({
- url: '/pages/inventory/goodsList1'
- })
- }, 1000)
+ }else{
+ let obj = {}
+ obj.num = 0
+ obj.price = 0
+ obj.saleId = item.id
+ obj.remark = item.remark
+ obj.xsyId = item.createBy
+ obj.createByName = item.createByName
+ dataList.push(obj)
+ }
+ let khName = {
+ name:item.userName,
+ id:item.userId,
+ area:item.area,
+ city:item.city,
+ address:item.receiveAddress,
+ province:item.province,
+ }
+ uni.setStorageSync('carList1', JSON.stringify(dataList))
+ uni.setStorageSync('khName', JSON.stringify(khName))
+ uni.setStorageSync('hangOrder', true)
+ uni.switchTab({
+ url: '/pages/inventory/goodsList1'
+ })
},
//点击切换折叠状态
clickCollapse(item) {
@@ -970,7 +1020,7 @@
.top {
width: 780rpx;
- height: 390rpx;
+ height: 330rpx;
opacity: 1;
background: linear-gradient(90deg, #6484fa 0%, #66e8ff 100%);
overflow: hidden;
@@ -1167,7 +1217,8 @@
.banner {
height: 150rpx;
- display: flex;
+ display: flex;
+ margin-top: 20rpx;
}
.banner-left,
diff --git a/package1/AI/AIInventoryList.vue b/package1/AI/AIInventoryList.vue
index cdf6634..4c162b2 100644
--- a/package1/AI/AIInventoryList.vue
+++ b/package1/AI/AIInventoryList.vue
@@ -82,12 +82,7 @@
uni.stopPullDownRefresh();
}, 500);
}).catch((res) => {})
-
- // this.tui.request("/app/sale/buyAi", "POST", {
- // aiMsg:'货号WhwBjn00001,x码黑色30件,s码儿,白色10件儿,双XL,x白色50件儿。 '
- // }, false, true).then((res) => {
- // this.aiList = res.result.records
- // }).catch((res) => {})
+ uni.stopPullDownRefresh()
},
backPage(){
uni.navigateBack({
diff --git a/package1/AI/AiChangeGoods.vue b/package1/AI/AiChangeGoods.vue
index 90c985b..fbedd57 100644
--- a/package1/AI/AiChangeGoods.vue
+++ b/package1/AI/AiChangeGoods.vue
@@ -6,12 +6,12 @@
+ @confirm="search" @blur="search" @clear="clearSearch" />
-
{{item.categoryName}}
@@ -48,6 +48,37 @@
+
+
+
+
+
+
+ 暂无图片
+
+
+ {{item.productName}}
+ {{item.productSn}}
+
+
+ {{item.inStorageStatus==0?'待入库':item.purchasePrice == null ?'新商品':item.purchasePrice}}
+ 采购价
+
+
+ {{item.wholesalePrice}}
+ 批发价
+
+
+ {{item.price}}
+ 零售价
+
+
+ {{item.stockCount}}
+ 库存
+
+
+
@@ -61,10 +92,12 @@
return {
indexList: [],
pageNum: 1, //分页的页码
- shopList: [],
+ shopList: [],
+ shopList1: [],
categoryId: '', //分类id
searchName: '', //搜索框输入值
- height: 0
+ height: 0,
+ gateType:''
}
},
onLoad() {
@@ -89,7 +122,7 @@
}
}
this.categoryId = this.indexList[0].id
- this.getShareList(this.indexList[0].id);
+ this.getShareList();
} else {
this.tui.toast(res.message)
}
@@ -107,19 +140,38 @@
})
},
//点击分类获取商品列表
- getShareList(id) {
- this.tui.request("/app/product/getShareList", "POST", {
- categoryId: this.categoryId,
- searchStr: this.searchName,
- pageNum: this.pageNum,
- pageSize: '10'
- }, false, false).then((res) => {
- if (res.code == 200) {
- this.shopList = res.result.records
- } else {
- this.tui.toast(res.message)
- }
- }).catch((res) => {})
+ getShareList(type) {
+ let data = {}
+ if(type=='search'){
+ this.gateType = 'search'
+ data = {
+ categoryId: "",
+ searchStr: this.searchName,
+ pageNum: this.pageNum,
+ pageSize: '100'
+ }
+ }else{
+ this.gateType = ''
+ data = {
+ categoryId: this.categoryId,
+ searchStr: this.searchName,
+ pageNum: this.pageNum,
+ pageSize: '100'
+ }
+ }
+ this.tui.request("/app/product/getShareList", "POST", data, false, false).then((res) => {
+ if (res.code == 200) {
+ if(type=='search'){
+ this.shopList = []
+ this.shopList1 = res.result.records
+ }else{
+ this.shopList1 = []
+ this.shopList = res.result.records
+ }
+ } else {
+ this.tui.toast(res.message)
+ }
+ }).catch((res) => {})
},
//跳转新增商品
goAddGoods() {
@@ -127,10 +179,21 @@
url: "/package1/inventory/addGoods"
})
},
- //顶部搜索框
- search(res) {
- this.searchName = res.value
- this.getShareList()
+ //顶部搜索框
+ search(e) {
+ if(e.value == ''){
+ this.searchName = ""
+ this.getShareList()
+ }else{
+ this.searchName = e.value
+ this.getShareList('search')
+
+ }
+ },
+ //清空搜索条件
+ clearSearch(){
+ this.searchName = ''
+ this.getShareList()
},
//未入库遮罩
clickMask(item) {
@@ -155,7 +218,7 @@
}
}
this.categoryId = this.indexList[index].id
- this.getShareList(this.indexList[index].id)
+ this.getShareList()
}
}
}
diff --git a/package1/AI/AiChat.vue b/package1/AI/AiChat.vue
index 263781c..4c6141c 100644
--- a/package1/AI/AiChat.vue
+++ b/package1/AI/AiChat.vue
@@ -125,12 +125,26 @@
close(){
this.$refs.popup.close()
},
+ spliceMsg(res){
+ let regex = /嗯|啊|儿|各|阿|恩/g;
+ return res.replace(regex, '')
+ },
+ convertChineseToArabic(str) {
+ const chineseNumToArabic = {
+ '零': 0, '一': 1, '二': 2, '两': 2, '三': 3,
+ '四': 4, '五': 5, '六': 6, '七': 7, '八': 8, '九': 9
+ };
+ const regex = /(零|一|二|两|三|四|五|六|七|八|九)/g;
+ return str.replace(regex, match => chineseNumToArabic[match]);
+ },
inputSaveText(){
+ let convertedStr = this.convertChineseToArabic(this.editText);
+ let getMsg = this.spliceMsg(convertedStr)
if(this.editText == ''){
return;
}
let data = {
- text:this.editText
+ text:getMsg
}
this.msgList.push(data)
this.editText = ''
@@ -164,7 +178,7 @@
}
console.log('语音',res)
let data = {
- text:res.result
+ text:this.spliceMsg(res.result)
}
that.msgList.push(data)
that.$forceUpdate()
@@ -209,7 +223,7 @@
let text = ' '
for(let i=0;i {
- if (res.code == 200) {
- this.res = JSON.stringify(res.result)
- } else {
- this.res = JSON.stringify(res.result)
- this.tui.toast(res.message)
- }
+ this.tui.request("/app/problemFeedback/getProblemFeedbackList", "POST", {
+ problemContent:'',
+ pageNum:1,
+ pageSize:10
+ }, false, false).then((res1) => {
+
}).catch((res) => {
- this.res = JSON.stringify(res.result)
+ this.tui.toast(res)
})
},
+ convertChineseToArabic(str) {
+ const chineseNumToArabic = {
+ '零': 0, '一': 1, '二': 2, '两': 2, '三': 3,
+ '四': 4, '五': 5, '六': 6, '七': 7, '八': 8, '九': 9
+ };
+ const regex = /(零|一|二|两|三|四|五|六|七|八|九)/g;
+ return str.replace(regex, match => chineseNumToArabic[match]);
+ },
goList(type){
if(type == 1){
uni.navigateTo({
diff --git a/package1/inventory/batchPrint.vue b/package1/inventory/batchPrint.vue
index e8a29ce..fa6f04d 100644
--- a/package1/inventory/batchPrint.vue
+++ b/package1/inventory/batchPrint.vue
@@ -20,7 +20,7 @@
{{item.lsprice}}
-
+ 零售价
@@ -340,7 +340,7 @@
}
if(this.multipleList.indexOf('零售价') != -1){
console.log(this.multipleList.indexOf('零售价'))
- strCmd += blesdk.addCPCLText('0', '230', '24', '0', 0, '零售价:'+(this.purchase !=''?item.lsprice:item.price))
+ strCmd += blesdk.addCPCLText('0', '230', '24', '0', 0, '零售价:'+(item.lsprice || item.price))
}
strCmd += blesdk.addCPCLQRCode(200, 140, 'H', '1', 6, [item.id,item.shopId]) //二维码
strCmd += blesdk.addCPCLLocation(0); //对齐指令 0-左对齐 1-右对齐 2-居中
diff --git a/package1/inventory/gategory.vue b/package1/inventory/gategory.vue
index 26a80cf..b255eb4 100644
--- a/package1/inventory/gategory.vue
+++ b/package1/inventory/gategory.vue
@@ -38,9 +38,8 @@
*您可以点击默认项快捷添加分类,如没有想要的快捷项,可以手动输入
-
-
+
-
diff --git a/package1/other/custom.vue b/package1/other/custom.vue
index ffa2758..de5ee4a 100644
--- a/package1/other/custom.vue
+++ b/package1/other/custom.vue
@@ -11,27 +11,25 @@
-
+
-
- 销售员:
- {{ item.createByName== null ?'暂无': item.createByName }}
+ 店铺:
+ {{ item.shopName== null ?'暂无': item.shopName }}
- 营业额:
+ 采购额:
{{ item.realAmount== null ?'暂无': item.realAmount}}
{{ ' 欠款: ' }}
{{ item.noEarn== null ?'暂无': item.noEarn}}
订单状态:
- {{
- item.status == 1 ? '拣货中' : item.status == 2 ? '已预定' : item.status == 3 ? '已作废' : item.status == 4 ? '已取货' :item.status == 6 ? '待配货': '已送达'
- }}
+ {{ 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' ?'待配货' :'挂单'}}
查看详情
@@ -85,8 +83,16 @@
// this.query.startDate = date
// this.query.endDate = date
// this.range = [date, date]
- this.getShopList()
- this.getAllList()
+
+ },
+ onShow(){
+ this.getShopList()
+ this.getAllList()
+ },
+ onLoad(option){
+ if(option.saleId !='' && option.userId == uni.getStorageSync('userId')){
+ this.kehuList(option.saleId)
+ }
},
methods: {
sectionChange(index) {
diff --git a/package1/other/customDetail.vue b/package1/other/customDetail.vue
index dffa353..aac565c 100644
--- a/package1/other/customDetail.vue
+++ b/package1/other/customDetail.vue
@@ -1,7 +1,7 @@
-
- {{sales.province + sales.area + sales.city + sales.receiveAddress}}
+
+ {{shopData.shopAddress}}
@@ -90,12 +90,8 @@
-
{{ val.attributeList.substr(1).substring(0,val.attributeList.substr(1).length-1).replace(/\"/g, "") }}
* {{val.productCount}}
-
@@ -131,7 +127,6 @@
物流单:
-
@@ -161,7 +156,7 @@
配送状态:
- {{ sales.status == 0 ?'待抢单' :sales.status == 1 ?'待取货' :sales.status == 2 ?'作废':sales.status == 3 ?'待送达' :sales.status == 4 ?'已完成' :sales.status == 5 ?'下游客户待退货' :sales.status == 00 ?'退货待抢单' :sales.status == 01 ?'退货待取货' :sales.status == 03 ?'退货待送达' :sales.status == 04 ?'待确认退货' :sales.status == 6 ?'待配货' :'挂单'}}
+ {{ sales.status == '0' ?'待抢单' :sales.status == '1' ?'待取货' :sales.status == '2' ?'作废':sales.status == '3' ?'待送达' :sales.status == '4' ?'已完成' :sales.status == '5' ?'下游客户待退货' :sales.status == '00' ?'退货待抢单' :sales.status == '01' ?'退货待取货' :sales.status == '03' ?'退货待送达' :sales.status == '04' ?'待确认退货' :sales.status == '6' ?'待配货' :'挂单'}}
@@ -237,6 +232,82 @@
},false,true).then(res => {
this.collection = res.result
}).catch(res => {});
+ },
+ //退款接口
+ getReturnOrder(id) {
+ let that = this;
+ this.tui.request("/app/return/list", "post", {
+ remark: 3,
+ saleId: id
+ }, false, false).then((res) => {
+ if (res.code == 200 && res.result != null && res.result != undefined) {
+ if (res.result != '') {
+ this.inventoryList = res.result
+ let returnDat = new Map();
+ this.inventoryList.forEach(item => {
+ this.tui.request("/app/return/get/" + item.id, "GET", null, false, false)
+ .then((res) => {
+ if (res.code == 200 && res.result != null && res.result !=
+ undefined) {
+ that.returnList.push(res.result)
+ that.shopList.push(...res.result.saleDetailDTOList);
+ var data = res.result.saleDetailDTOList
+ for (let i = 0; i < data.length; i++) {
+ for (let m = 0; m < data[i].stockLogList1
+ .length; m++) {
+ if (returnDat.has(data[i].productId + '-' + data[i]
+ .stockLogList1[m].attributeList) == true) {
+ returnDat.set(data[i].productId + '-' + data[i]
+ .stockLogList1[m].attributeList,
+ returnDat.get(data[i].productId + '-' +
+ data[i].stockLogList1[m]
+ .attributeList) + data[i]
+ .stockLogList1[m].productCount)
+ } else {
+ returnDat.set(data[i].productId + '-' + data[i]
+ .stockLogList1[m].attributeList, data[
+ i].stockLogList1[m].productCount)
+ }
+ }
+ }
+ this.zReturnNum = 0
+ this.$nextTick(()=>{
+ for (let i = 0; i < that.list.length; i++) {
+ for (let z = 0; z < that.list[i].stockLogList1.length; z++) {
+
+ that.zReturnNum += that.list[i].stockLogList1[z].productCount
+ if (returnDat.has(that.list[i].productId + '-' + that.list[i].stockLogList1[z].attributeList) == true) {
+ that.list[i].stockLogList1[z].maxNum = that.list[i].stockLogList1[z].productCount -
+ returnDat.get(that.list[i].productId + '-' + that.list[i].stockLogList1[z].attributeList)
+ }else{
+ that.list[i].stockLogList1[z].maxNum = that.list[i].stockLogList1[z]
+ .productCount
+ }
+ }
+ }
+
+ })
+ console.log(returnDat);
+ returnDat.forEach(function(value, key) {
+ that.zReturnNum -= value
+ })
+ console.log('退货',that.zReturnNum)
+ }
+ }).catch((res) => {})
+ })
+ } else {
+ for (let i = 0; i < that.list.length; i++) {
+ for (let z = 0; z < that.list[i].stockLogList1.length; z++) {
+ that.list[i].stockLogList1[z].maxNum = that.list[i].stockLogList1[z]
+ .productCount
+ }
+ }
+ }
+ } else {
+ this.tui.toast(res.message)
+ }
+ })
+ console.log('刷新',that.list)
},
//点击图片放大
showImage() {
diff --git a/package1/other/logistics.vue b/package1/other/logistics.vue
index 80bfc2a..0ec314a 100644
--- a/package1/other/logistics.vue
+++ b/package1/other/logistics.vue
@@ -7,10 +7,10 @@
今日订单
- ({{waitUpDoorNum}}个待上门取货)
-
+ ({{waitUpDoorNum}}个待上门取货)
+
@@ -43,7 +43,39 @@
+ @trigger="trigger" />
+
+
+
+
@@ -90,7 +122,8 @@
type:'',
companyName:'',
current:0,
- waitUpDoorNum:0
+ waitUpDoorNum:0,
+ upDoorList:[]
}
},
created() {
@@ -140,6 +173,7 @@
dataType: 'json',
success: (res) => {
if (res.data.code == 200){
+ this.upDoorList = res.data.result.records
this.waitUpDoorNum = res.data.result.total
}
},
@@ -148,6 +182,35 @@
}
})
},
+ toggle(){
+ this.$refs.popup.open()
+ },
+ getSale(item){
+ uni.request({
+ url: this.tui.interfaceUrl() + '/app/sale/companyGetSale',
+ data: {
+ saleId:item.saleId
+ },
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded',
+ 'appWLToken': this.tui.getToken()
+ },
+ method: 'POST', //'GET','POST'
+ dataType: 'json',
+ success: (res) => {
+ if (res.data.code == 200){
+ this.tui.toast("确认取货成功")
+ setTimeout(res => {
+ this.waitPickUp()
+ }, 1000)
+
+ }
+ },
+ fail: (res) => {
+ this.tui.toast("网络不给力,请稍后再试~")
+ }
+ })
+ },
upOrDown(){
var url
if(this.type == 1){ //上线状态
@@ -208,6 +271,27 @@
}
});
}
+ },
+ //复制地址
+ upDoorCopyAddress(item,type){
+ console.log(item);
+ if(type=='fa'){
+ var data = item.shopName + item.createByPhone +'河北省沧州市运河区明珠商贸城' + item.shopAddress
+ uni.setClipboardData({
+ data: data,
+ success: function () {
+ console.log('复制成功');
+ }
+ });
+ }else{
+ var data = item.userName +item.userPhone + item.province+item.city+item.area + item.receiveAddress
+ uni.setClipboardData({
+ data: data,
+ success: function () {
+ console.log('复制成功');
+ }
+ });
+ }
},
sectionChange(index) {
this.current = index
@@ -445,5 +529,26 @@
font-size: 28rpx;
margin-bottom: 26rpx;
}
+ }
+ .type-popup{
+ width: 600rpx;
+ height: 1200rpx;
+ overflow: scroll;
+ background: #fff;
+ border-radius: 10px;
+ position: relative;
+ margin-bottom: 40rpx;
+ }
+ .popup-btn{
+ width: 120rpx;
+ height: 60rpx;
+ border-radius: 10px;
+ color: #fff;
+ font-size: 24rpx;
+ line-height: 60rpx;
+ text-align: center;
+ background: linear-gradient(90deg, #60F3FF, #088FEB);
+ float: right;
+ margin: 0 10rpx 20rpx 0;
}
\ No newline at end of file
diff --git a/package1/other/logisticsAddress.vue b/package1/other/logisticsAddress.vue
index 2e913b8..f74c7d8 100644
--- a/package1/other/logisticsAddress.vue
+++ b/package1/other/logisticsAddress.vue
@@ -6,9 +6,15 @@
{{item.province +'-'+ item.city+'-'+item.area}}
+
+
+ {{item.network == null ?'':item.network}}
-
+
+
+ 费用说明
编辑
@@ -35,6 +41,20 @@
确认
+
+
+
+
@@ -50,7 +70,8 @@
city: '',
area: '',
id: ''
- },
+ },
+ chargingStandard:'',
show: false,
standardList:[],
status: 'loadmore',
@@ -90,6 +111,11 @@
this.getList();
},
methods: {
+ priceDetail(item){
+ console.log(item)
+ this.chargingStandard = item.chargingStandard
+ this.$refs.payDialog.open()
+ },
//获取列表
getList(){
let that = this;
@@ -298,18 +324,20 @@
.popup-content {
- align-items: center;
- justify-content: center;
- padding: 15px;
- width: 500rpx;
- height: 700rpx;
- background-color: #fff;
+ align-items: center;
+ justify-content: center;
+ padding: 15px;
+ width: 500rpx;
+ height: auto;
+ background-color: #fff;
+ min-height: 500rpx;
+ text-align: center;
}
.popup-title {
- font-size: 36rpx;
- font-weight: bold;
- text-align: center;
+ font-size: 36rpx;
+ font-weight: bold;
+ text-align: center;
position: relative;
}
diff --git a/package1/stock/addStock.vue b/package1/stock/addStock.vue
index af24b3d..df54d61 100644
--- a/package1/stock/addStock.vue
+++ b/package1/stock/addStock.vue
@@ -2,11 +2,11 @@
+ @confirm="search" @blur="search" @clear="clearSearch" />
-
{{item.categoryName}}
@@ -42,6 +42,36 @@
+
+
+
+
+
+
+ 暂无图片
+
+
+ {{item.productName}}
+ {{item.productSn}}
+
+
+ {{item.inStorageStatus==0?'待入库':item.purchasePrice == null ?'新商品':item.purchasePrice}}
+ 采购价
+
+
+ {{item.wholesalePrice}}
+ 批发价
+
+
+ {{item.price}}
+ 零售价
+
+
+ {{item.stockCount}}
+ 库存
+
+
+
@@ -116,6 +146,7 @@
status: 'loadmore',
pageNum: 1, //分页的页码
shopList: [],
+ shopList1: [],
pages: 1,
totalPages: 0,
info: 0,
@@ -131,7 +162,8 @@
productId:'',
pdList:[],
stockList:[],
- height:0
+ height:0,
+ gateType:''
}
},
filters: {
@@ -218,7 +250,7 @@
}
}
this.categoryId = this.indexList[0].id
- this.getShareList(this.indexList[0].id);
+ this.getShareList();
} else {
this.tui.toast(res.message)
}
@@ -241,21 +273,38 @@
delta: 1
})
},
- //点击分类获取商品列表
- getShareList(id) {
- this.tui.request("/app/product/getShareList", "POST", {
- categoryId: this.categoryId,
- searchStr: this.searchName,
- pageNum: this.pageNum,
- pageSize: '10'
- }, false, false).then((res) => {
- if (res.code == 200) {
-
- this.shopList = res.result.records
- } else {
- this.tui.toast(res.message)
- }
- }).catch((res) => {})
+ getShareList(type) {
+ let data = {}
+ if(type=='search'){
+ this.gateType = 'search'
+ data = {
+ categoryId: "",
+ searchStr: this.searchName,
+ pageNum: this.pageNum,
+ pageSize: '100'
+ }
+ }else{
+ this.gateType = ''
+ data = {
+ categoryId: this.categoryId,
+ searchStr: this.searchName,
+ pageNum: this.pageNum,
+ pageSize: '100'
+ }
+ }
+ this.tui.request("/app/product/getShareList", "POST", data, false, false).then((res) => {
+ if (res.code == 200) {
+ if(type=='search'){
+ this.shopList = []
+ this.shopList1 = res.result.records
+ }else{
+ this.shopList1 = []
+ this.shopList = res.result.records
+ }
+ } else {
+ this.tui.toast(res.message)
+ }
+ }).catch((res) => {})
},
//弹出购物车或者商品规格选择弹窗
toggle(type, item) {
@@ -323,10 +372,21 @@
}
})
},
- //顶部搜索框
- search(res) {
- this.searchName = res.value
- this.getShareList()
+ //顶部搜索框
+ search(e) {
+ if(e.value == ''){
+ this.searchName = ""
+ this.getShareList()
+ }else{
+ this.searchName = e.value
+ this.getShareList('search')
+
+ }
+ },
+ //清空搜索条件
+ clearSearch(){
+ this.searchName = ''
+ this.getShareList()
},
//点击左侧菜单切换
clickLeftBtn(index) {
@@ -338,7 +398,7 @@
}
}
this.categoryId = this.indexList[index].id
- this.getShareList(this.indexList[index].id)
+ this.getShareList()
},
//删除整条商品
delShop(item) {
@@ -652,7 +712,6 @@
line-height: 140rpx;
color: #777;
background: #eee;
- margin-top:20rpx;
}
button {
color: #ffffff !important;
diff --git a/package1/stock/goodsStock.vue b/package1/stock/goodsStock.vue
index d7d6bcb..c4782d3 100644
--- a/package1/stock/goodsStock.vue
+++ b/package1/stock/goodsStock.vue
@@ -67,42 +67,7 @@
this.tui.toast(res.message)
}
- })
-
- // this.tui.request("/purchaseOcrPicture/multiRoundConversationCall", "POST", {
- // picturePath:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/c6b429d82cc445dc836ea1e6d7a5f6f2.jpg',
- // secondQuestionMsg:'',
- // firstQuestionMsg:'这是一个入库小票,JSON格式为:{ "productSn": "货号", "productName": "商品名称","price": "单价", "productCount": "数量", "attributeList": "{"颜色":"红色","尺码":"均码"}" }, 请帮我返回46条不同商品或规格的json数据'
- // }, false, true).then((res) => {
- // this.status = 'nomore';
- // if (res.code == 200) {
- // if (this.pages == 1) {
- // this.stockList = res.result.records
- // } else {
- // this.stockList = [...this.stockList, ...res.result.records]
- // }
- // this.totalPages = res.result.pages
- // } else {
- // this.tui.toast(res.message)
- // }
-
- // })
- // this.tui.request("/purchaseOcrPicture/invoicingAi", "POST", {
- // questionMsg:'货号87654335,S码天空蓝70件,M码儿,白色50件儿,XL码儿,天蓝色50件儿。\n" + "货号87654336,S码所有颜色80件,M码儿,白色50件儿,XL码儿,天蓝色50件儿。\n" + "货号87654337,S码黑色30件,M码儿,白色50件儿,XL码儿,天蓝色50件儿。\n" + "货号87654338,S码粉红色40件,M码儿,玫瑰色50件儿,XL码儿,天蓝色50件儿。\n" + "货号87654339,S码奶奶灰50件,M码儿,绿色50件儿,XL码儿,天蓝色50件儿。\n" + "货号87654340,S码卡其色60件,M码儿,王浩伟色50件儿,XL码儿,天蓝色50件儿。\n" + "货号87654341,S码天空蓝70件,M码儿,白色50件儿,XL码儿,天蓝色50件儿。\n" + "货号87654342,S码天空蓝70件,M码儿,白色50件儿,XL码儿,天蓝色50件儿。\n" + "货号87654343,S码天空蓝70件,M码儿,白色50件儿,XL码儿,天蓝色50件儿。\n" + "货号87654344,S码天空蓝70件,M码儿,白色50件儿,XL码儿,天蓝色50件儿。\n" + " 这是客户要货信息,json格式为:[{ "productSn": "货号", "attributeList": "[{"颜色":"红色","尺码":"均码","productCount": "数量"}]" }],请帮我返回10条不同商品或规格的json数据'
- // }, false, true).then((res) => {
- // this.status = 'nomore';
- // if (res.code == 200) {
- // if (this.pages == 1) {
- // this.stockList = res.result.records
- // } else {
- // this.stockList = [...this.stockList, ...res.result.records]
- // }
- // this.totalPages = res.result.pages
- // } else {
- // this.tui.toast(res.message)
- // }
-
- // })
+ })
},
searchList(res) {
this.pages = 1;