wangfukang 2 years ago
parent
commit
313081ff34
  1. 8
      pages/billing/changeGoods1.vue
  2. 9
      pages/index/checkShop.vue
  3. 42
      pages/index/customAndSupplierProductDetail.vue
  4. 10
      pages/index/dataStatistics.vue
  5. 82
      pages/index/index.vue
  6. 4
      pages/index/shareStyle.vue
  7. 125
      pages/index/waitStorage.vue
  8. 542
      pages/inventory/goodsList1.vue
  9. 2
      pages/inventory/inventory.vue
  10. 17
      pages/inventory/inventoryDetail.vue
  11. 4
      pages/login/login.vue

8
pages/billing/changeGoods1.vue

@ -21,7 +21,7 @@
</view>
<view class="box-right">
<view class="box-right-name">
{{item.productSn}}({{item.productName == null ?'':item.productName}})
{{item.productSn==null?'':item.productSn}}({{item.productName == null ?'':item.productName}})
<text style="color: red;" v-if="item.delFlag == 0">(已下架)</text>
</view>
<view class="box-right-num">供应商:{{item.supplierName== null?'':item.supplierName}}</view>
@ -58,7 +58,7 @@
{{item.productSn}}
<text v-if="item.productName">({{item.productName == null ?'':item.productName}})</text>
</view>
<view class="box-right-num">供应商:{{item.supplierName}}</view>
<view class="box-right-num">供应商:{{item.supplierName== null?'':item.supplierName}}</view>
<view class="box-right-price">
<!-- <view class="price-box" v-if="storageType== 0">
<text>{{item.inStorageStatus==0?'待入库':item.purchasePrice == null ?'新商品':item.purchasePrice}}</text>
@ -239,10 +239,10 @@
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="popup-title-right">
<view class="popup-title-right-box" style="color: #088FEB;">{{item.productName}}</view>
<view class="popup-title-right-box" style="color: #088FEB;">{{item.productName == null?'':item.productName}}</view>
<view class="popup-title-right-box">{{item.productSn}}</view>
<view class="popup-title-right-box">
<text style="margin-right:20rpx;">供应商:{{item.supplierName}}</text>
<text style="margin-right:20rpx;">供应商:{{item.supplierName==null?"":item.supplierName}}</text>
<view style="position: absolute;top: 30rpx;right: 30rpx;" @tap.stop="delShop(item)">
<uni-icons color="red" type="trash" size="26"></uni-icons>
</view>

9
pages/index/checkShop.vue

@ -65,7 +65,7 @@
shopList: [],
shopId: null,
current: '',
shopOwnerName:'',
shopOwnerPhone:'',
name: '',
type:''
}
@ -89,8 +89,9 @@
uni.setStorageSync('shopIcon', res.result.shopIcon)
uni.setStorageSync('type', res.result.userType)
uni.setStorageSync('shopId', this.current)
uni.setStorageSync("shopOwnerPhone", item.shopOwnerPhone)
this.tui.toast('切换店铺成功', 2000, true)
uni.setStorageSync("shopOwnerPhone", this.shopOwnerPhone)
this.tui.toast('切换店铺成功', 2000, true)
uni.removeStorageSync('endTime')
setTimeout(() => {
uni.reLaunch({
url: '/pages/index/index'
@ -200,7 +201,7 @@
}else{
this.current = item.shopId
this.name = item.shopName
this.shopOwnerName = item.shopOwnerName
this.shopOwnerPhone = item.shopOwnerPhone
}
},
onEditSave() {

42
pages/index/customAndSupplierProductDetail.vue

@ -346,7 +346,7 @@
<uni-tr v-for="(items,index1) in item.returnSaleDetailList" :key="index1"
@tap="xiaoshouDetail('3',items)">
<uni-td align="center">{{items.productSn}}</uni-td>
<uni-td align="center">{{item.productCount}}</uni-td>
<uni-td align="center">{{items.productCount}}</uni-td>
<uni-td align="center">{{items.discountAmount}}</uni-td>
<uni-td
align="center">{{userType == 0 && isDownKH == false?items.purchasePrice == null?0:items.purchasePrice:0}}</uni-td>
@ -415,7 +415,7 @@
<uni-td align="center">{{item1.productSn}}</uni-td>
<uni-td
align="center">{{item1.productCount == null ?'0':item1.productCount}}</uni-td>
<uni-td align="center">{{item1.purchasePrice}}</uni-td>
<uni-td align="center">{{item1.purchasePrice?item1.purchasePrice:0}}</uni-td>
<uni-td align="center">{{item1.productCount * item1.purchasePrice || 0}}</uni-td>
</uni-tr>
<uni-tr>
@ -642,7 +642,7 @@
<uni-td align="center">{{item1.productCount}}</uni-td>
<!-- <uni-td align="center">{{item1.supplierBuyProductDetailLogVos[0].realPrice * item1.productCount}}</uni-td> -->
<uni-td
align="center">{{userType == 0 ?item1.supplierBuyProductDetailLogVos[0].purchasePrice:0}}</uni-td>
align="center">{{userType == 0 ?(item1.supplierBuyProductDetailLogVos[0].purchasePrice == null?0:item1.supplierBuyProductDetailLogVos[0].purchasePrice):0}}</uni-td>
<uni-td align="center">{{item1.productCount * item1.supplierBuyProductDetailLogVos[0].purchasePrice || 0}}</uni-td>
<!-- <uni-td align="center">{{userType == 0 && isDownKH == false?((item1.supplierBuyProductDetailLogVos[0].realPrice - item1.customerBuyProductDetailLogVos[0].purchasePrice) * item1.productCount).toFixed(2):0}}</uni-td> -->
</uni-tr>
@ -1078,6 +1078,42 @@
this.$forceUpdate()
}
} else if (this.current == 3) {
if(this.type == 'gysName'){
// for (let i = 0; i < this.list.length; i++) {
// this.list[i].productCount = 0
// for (let j = 0; j < this.list[i].supplierBuySaleVos.length; j++) {
// this.list[i].supplierBuySaleVos[j].productCount = 0
// for (let m = 0; m < this.list[i].supplierBuySaleVos[j]
// .supplierBuyProductDetailLogVos.length; m++) {
// this.list[i].productCount += this.list[i].supplierBuySaleVos[j]
// .supplierBuyProductDetailLogVos[m].productCount
// this.list[i].supplierBuySaleVos[j].productCount += this.list[i]
// .supplierBuySaleVos[j].supplierBuyProductDetailLogVos[m]
// .productCount
// }
// }
// }
// this.$forceUpdate()
}else{
for (let i = 0; i < this.list.length; i++) {
for (let j = 0; j < this.list[i].returnSaleDetailList.length; j++) {
this.list[i].returnSaleDetailList[j].productCount = 0
for (let m = 0; m < this.list[i].returnSaleDetailList[j]
.stockLogList1.length; m++) {
this.list[i].returnSaleDetailList[j].productCount += this.list[i]
.returnSaleDetailList[j].stockLogList1[m]
.productCount
}
}
}
this.$forceUpdate()
}
}
} else {
this.tui.toast(res.message)

10
pages/index/dataStatistics.vue

@ -58,7 +58,7 @@
{{item.name}}
</view>
<view style="width: 30%;">
<text style="display: inline-block;width: 150rpx;text-align: center;">{{item.name == '销售金额'?shopInfo.totalAmount:item.name == '实收金额'?shopInfo.totalAlreadyEarn:item.name == '利润' && type == 0?shopInfo.totalProfit:item.name == '进货金额' && type == 0?shopInfo.purchasingCost:item.name == '退货金额'?shopInfo.returnTotalAmount:item.name == '下单客户'?shopInfo.totalCCount:""}}</text>
<text style="display: inline-block;width: 150rpx;text-align: center;">{{item.name == '销售金额'?shopInfo.totalAmount:item.name == '销售总件数'?shopInfo.totalJCount:item.name == '退货总件数'?shopInfo.returnTotalCount:item.name == '实收金额'?shopInfo.totalAlreadyEarn:item.name == '利润' && type == 0?shopInfo.totalProfit:item.name == '进货金额' && type == 0?shopInfo.purchasingCost:item.name == '退货金额'?shopInfo.returnTotalAmount:item.name == '下单客户'?shopInfo.totalCCount:""}}</text>
<uni-icons type="right" size="24" color="#777"></uni-icons>
</view>
</view>
@ -77,6 +77,10 @@
name:'销售金额',
value:'xiaoshou',
icon:'cart',
},{
name:'销售总件数',
value:'xiaoshou',
icon:'cart',
},{
name:'实收金额',
value:'shishou',
@ -93,6 +97,10 @@
name:'退货金额',
value:'tuihuo',
icon:'refreshempty'
},{
name:'退货总件数',
value:'tuihuo',
icon:'refreshempty'
},{
name:'下单客户',
value:'xiadankehu',

82
pages/index/index.vue

@ -2,6 +2,9 @@
<view>
<cmd-nav-bar iconOne="menu" @iconOne="goToInfo" :title="shopName" background-color="#fff"></cmd-nav-bar>
<view class="IndexContent">
<view v-if="enDayShow" style="width:100%;height:60rpx;">
<u-notice-bar mode='horizontal' bgColor="#088FEB" color="#eee" :text="textArr"></u-notice-bar>
</view>
<view class="contentPadding" style="color:#000; !important;padding: 28rpx 20rpx 0 !important;">
<view class="title-btn-d">
<view class="title-btn-sbtn" @tap="goSonPage('/pages/index/returnList')">
@ -139,6 +142,8 @@
clickable isLink arrow-direction="left"></u-cell> -->
<u-cell icon="man-add-fill" url="/pages/index/waitStorage?inStorageStatus=1" title="采购单历史"
clickable isLink arrow-direction="left"></u-cell>
<u-cell icon="man-add-fill" url="/package1/inventory/inventoryReturn" title="采购退货"
clickable isLink arrow-direction="left"></u-cell>
<u-cell icon="man-add-fill" url="/package1/stock/goodsStock" title="盘点管理" clickable isLink
arrow-direction="left"></u-cell>
<view class="border-line"></view>
@ -150,10 +155,15 @@
isLink arrow-direction="left"></u-cell>
<u-cell icon="account-fill" url="/package1/index/returnOrder" title="退货单历史" clickable
isLink arrow-direction="left"></u-cell>
<view class="border-line"></view>
<!-- <u-cell icon="home-fill" url="/package1/index/warehouseList"
title="仓库管理" clickable isLink arrow-direction="left"></u-cell>
<u-cell icon="home-fill" url="/package1/index/shopAssociation"
title="店铺关联组" clickable isLink arrow-direction="left"></u-cell> -->
<view class="border-line"></view>
<u-cell icon="rewind-right-fill" url="/package1/index/updateShopMsg" title="更新店铺信息" clickable
isLink arrow-direction="left"></u-cell>
<u-cell v-if="shopName == '提钱退休' || shopName == '测试库新店' || shopName == '侧视颠仆'"
<u-cell v-if="shopName == '提钱退休' || shopName == '测试库新店'"
icon="integral-fill" url="/package1/AI/addAiList" title="管理员登录" clickable isLink
arrow-direction="left"></u-cell>
<!-- <u-cell icon="integral-fill" url="" title="电费缴纳" clickable isLink
@ -170,7 +180,7 @@
arrow-direction="left"></u-cell>
<u-cell icon="setting-fill" url="/pages/index/shopInfo" title="修改个人信息" clickable isLink
arrow-direction="left"></u-cell>
<u-cell icon="home-fill" @click="outLogin" title="退出登录" clickable isLink
<u-cell icon="rewind-left-fill" @click="outLogin" title="退出登录" clickable isLink
arrow-direction="left"></u-cell>
</u-cell-group>
</view>
@ -255,7 +265,10 @@
},
},
shopInfo: {},
waitCount: {}
waitCount: {},
enDayShow:false,
endDay:'',
textArr:[]
}
},
components: {
@ -290,6 +303,7 @@
that.type = res.data
}
});
this.getEndTime()
var today = new Date();
var day = today.getDate();
//宣传页
@ -299,11 +313,50 @@
uni.setStorageSync("publicize", day)
this.$refs.publicizepopup.open('center')
}
},
onTabItemTap(e) {
this.getSaleInfo()
},
methods: {
//获取店铺到期时间
getEndTime(){
var today = new Date();
var day = today.getDate();
if(uni.getStorageSync('endTime')){
this.endTime = uni.getStorageSync('endTime')
this.endDay = this.daysUntil(this.endTime)
if(this.endDay < 7){
this.enDayShow = true
}
}else{
this.tui.request("/app/shop/getShopInfoById", "post", {
id: uni.getStorageSync('shopId')
}, false, true).then((res) => {
uni.setStorageSync('endTime',res.result.endTime)
this.endTime = res.result.endTime
this.endDay = this.daysUntil(res.result.endTime)
if(this.endDay < 7){
this.enDayShow = true
}
})
}
setTimeout(res1=>{
if(this.endTime != undefined){
let text = '您的店铺有效期至'+this.endTime+',还有'+this.endDay+'天到期,请及时联系管理员续费或开通'
this.textArr.push(text)
console.log(this.textArr)
}
},500)
},
daysUntil(dateStr) {
const targetDate = new Date(dateStr);
const currentDate = new Date();
const differenceInMs = targetDate - currentDate;
const daysDifference = Math.ceil(differenceInMs / (1000 * 60 * 60 * 24));
return daysDifference;
},
popClose() {
this.$refs.publicizepopup.close()
},
@ -453,18 +506,16 @@
obj.createByName = item.createByName
dataList.push(obj)
}
console.log('lastDebtAmount',item.lastDebtAmount)
this.$nextTick(()=>{
this.tui.request("/app/customer/list", "post", {
notBuyDays: "",
pageNum: 1,
pageSize: 10,
searchStr: item.userName,
sort: "",
}, false, false).then((res) => {
this.tui.request("/app/debt/selectByUserId", "post", {
shopId:uni.getStorageSync('shopId'),
userId:item.userId
}, false, true).then((res) => {
if (res.code == 200) {
this.returnList = new Map()
uni.setStorageSync('khName', JSON.stringify(res.result.records[0]))
this.returnList = new Map()
res.result.noEarn = res.result.amountOwed
res.result.name = res.result.userName
uni.setStorageSync('khName', JSON.stringify(res.result))
uni.setStorageSync('carList1', JSON.stringify(dataList))
uni.setStorageSync('hangOrder', true)
uni.switchTab({
@ -826,4 +877,9 @@
margin-top: 20rpx !important;
color: #fff !important;
}
.u-notice-bar{
height: 60rpx;
line-height: 60rpx;
font-size: 30rpx;
}
</style>

4
pages/index/shareStyle.vue

@ -10,7 +10,7 @@
:class="item.parentId ? 'red' :''">{{item.categoryName}}</text>
</view>
</view>
<view class="content-right" style="width: 570rpx;background: #fff;margin: 100rpx 0 70rpx 170rpx;height: 76%;padding-bottom: 50rpx;">
<view class="content-right" style="width: 570rpx;background: #fff;margin: 100rpx 0 120rpx 170rpx;height: 76%;padding-bottom: 50rpx;">
<view class="right-box" v-for="(item,index) in shopList" :key="index" v-if="item.delFlag">
<!-- 当商品的delFlag=0和未入库状态时,显示此遮罩,点击弹出弹窗提示不能操作 -->
<!-- <view class="shop-mask" v-if="item.delFlag == 0 || item.purchasePrice==null || item.inStorageStatus == 0" @tap.stop="clickMask"></view> -->
@ -23,7 +23,7 @@
{{item.productName == null ?'':item.productName}}
<text style="color: red;" v-if="item.delFlag == 0">(已下架)</text>
</view>
<view class="box-right-num">{{item.productSn}}</view>
<view class="box-right-num">{{item.productSn==null?'':item.productSn}}</view>
<view class="box-right-num">供应商:{{item.supplierName == null ?'':item.supplierName}}</view>
<view class="box-right-price">
<view class="price-box" v-if="type==0">

125
pages/index/waitStorage.vue

@ -49,9 +49,10 @@
<view class="uni-body">
<text class="cardText">订单状态:</text>{{item.delFlag == 1 ?'已撤销':item.inStorageStatus == 0 ?'未入库' :item.inStorageStatus == 1 ?'已入库':item.inStorageStatus == 2 ?'AI识别-识别中...':item.inStorageStatus == 3 || (item.inStorageStatus == 4 && item.ocrCount > 0) ?'AI识别-识别完成':item.ocrCount == 0 && item.inStorageStatus == 4?'AI识别-识别失败':'暂无'}}
</view>
<view v-if="item.inStorageStatus== 0 && type==0" class="return-price" @tap.stop="returnPrice(item)">更新</view>
<view v-if="item.delFlag != 1 && type==0" class="return-price" @tap.stop="returnPrice(item,index)">撤销</view>
<view v-if="item.inStorageStatus == 2 || item.inStorageStatus == 3 || item.inStorageStatus == 4" class="return-price" style="width:105rpx;" @tap.stop="returnPrice(item)">AI入库</view>
<view v-if="item.inStorageStatus== 0 && type==0" class="return-price" @tap.stop="goDetail(item)">更新</view>
<view v-if="item.inStorageStatus!= 0 && item.delFlag != 1 && type==0" class="return-price" style="width: auto;right: 130rpx;padding: 0 10px;" @tap.stop="cancelOrder(item)">撤销并复制</view>
<view v-if="item.inStorageStatus!= 0 && item.delFlag != 1 && type==0" class="return-price" @tap.stop="returnPrice(item,index)">撤销</view>
<view v-if="item.inStorageStatus == 2 || item.inStorageStatus == 3 || item.inStorageStatus == 4" class="return-price" style="width:105rpx;right:150rpx;" @tap.stop="returnPrice(item)">AI入库</view>
</uni-card>
</li>
</ul>
@ -116,7 +117,121 @@
}
}
},
methods: {
methods: {
// 取消订单
cancelOrder(item) {
let that = this;
// await this.getReturnOrder(item.id)
this.tui.modal("提示", "您确定要撤销此采购单吗?", true, (res) => {
if (res) {
that.cancelOk(item)
}
})
},
// 取消订单
cancelOk(item) {
let that = this;
that.tui.request('/app/purchase/cancelPurchase', "POST", {
id:item.id
}, true, true).then((res1) => {
if (res1.code == 200) {
that.goSaleGoods(item)
} else {
that.tui.toast(res.message)
}
}).catch((res1) => {})
},
sliceMsg(val) {
var name = ''
if (typeof(val) == 'string') {
let newObj = JSON.parse(val)
for (let as in newObj) {
name += newObj[as] + '/'
}
}
return name;
},
//带参数跳转到入库页
async goSaleGoods(item) {
let dataList = []
await this.tui.request('/app/purchase/getPurchaseAllData', "POST", {
id:item.id
}, false, true).then((res1) => {
if(res1.code == 200){
if(!res1.result.purchaseDetails){
res1.result.purchaseDetails = []
}
if (res1.result.purchaseDetails) {
for (let i = 0; i < res1.result.purchaseDetails.length; i++) {
let obj = {}
let attrMap = new Map()
let newSaleDetailDTOList = []
let num = 0
for (let m = 0; m < res1.result.purchaseDetails[i].stockLogList1.length; m++) {
if (attrMap.has(res1.result.purchaseDetails[i].stockLogList1[m].attributeList) == true) {
let hasCount = attrMap.get(res1.result.purchaseDetails[i].stockLogList1[m].attributeList)
newSaleDetailDTOList[hasCount].productCount = Number(newSaleDetailDTOList[hasCount]
.productCount) + Number(res1.result.purchaseDetails[i].stockLogList1[m].productCount)
} else {
res1.result.purchaseDetails[i].stockLogList1[m].name = this.sliceMsg(res1.result.purchaseDetails[i]
.stockLogList1[m].attributeList)
newSaleDetailDTOList.push(res1.result.purchaseDetails[i].stockLogList1[m])
attrMap.set(res1.result.purchaseDetails[i].stockLogList1[m].attributeList, num)
num++
}
}
obj.saleDetailQueryDTO = newSaleDetailDTOList
obj.num = 0
obj.id = res1.result.purchaseDetails[i].productId
obj.purchasePrice = res1.result.purchaseDetails[i].purchasePrice
obj.price = res1.result.purchaseDetails[i].price
obj.categoryId = res1.result.purchaseDetails[i].categoryId
obj.productName = res1.result.purchaseDetails[i].productName
obj.productPicture = res1.result.purchaseDetails[i].productPicture
obj.productSn = res1.result.purchaseDetails[i].productSn
obj.productId = res1.result.purchaseDetails[i].productId
obj.wholesalePrice = res1.result.purchaseDetails[i].wholesalePrice
obj.saleId = item.id
obj.remark = item.remark
obj.xsyId = item.createBy
obj.createByName = item.createByName
dataList.push(obj)
}
} 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)
}
uni.setStorageSync('AiInventoryId', res1.result.purchase.id)
}
}).catch((res1) => {})
console.log('dataList',dataList)
await this.tui.request("/app/debt/selectByUserId", "post", {
shopId:uni.getStorageSync('shopId'),
userId:item.supplierId
}, false, true).then((res) => {
if (res.code == 200) {
console.log('khName',res.result)
res.result.noEarn = res.result.amountOwed
res.result.consigneeName = res.result.userName
res.result.id = res.result.userId
uni.setStorageSync('khName', JSON.stringify(res.result))
uni.setStorageSync('carList1', JSON.stringify(dataList))
uni.setStorageSync('hangOrder', true)
uni.navigateTo({
url: '/package1/AI/voiceInventory',
})
}
})
},
searchTime(res){
console.log(res)
if(res == ''){
@ -213,7 +328,7 @@
this.khOrGysList()
},
goDetail(item){
uni.setStorageSync('noReload',true)
// uni.setStorageSync('noReload',true)
uni.navigateTo({
url: '/package1/index/waitStorageDetail?id=' + item.id
})

542
pages/inventory/goodsList1.vue

File diff suppressed because it is too large

2
pages/inventory/inventory.vue

@ -62,7 +62,7 @@
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="box-right">
<view class="box-right-num">货号:{{item.productSn}}</view>
<view class="box-right-num">货号:{{item.productSn==null?'':item.productSn}}</view>
<view class="box-right-name">名称:{{item.productName == null?'暂无':item.productName}}</view>
<view class="box-right-name">供应商:{{item.supplierName == null?'暂无':item.supplierName}}</view>
<!-- 1上架 0下架 -->

17
pages/inventory/inventoryDetail.vue

@ -110,7 +110,7 @@
<uni-tr @tap="rukuDetail(item.purchaseDetails[0])">
<uni-td align="center">{{item.purchase.supplierName}}</uni-td>
<uni-td align="center">{{item.purchase.totalAmount}}</uni-td>
<uni-td align="center">{{type == 0?item.purchaseDetails[0].purchasePrice:0}}</uni-td>
<uni-td align="center">{{type == 0?(item.purchaseDetails[0].purchasePrice==null?0:item.purchaseDetails[0].purchasePrice):0}}</uni-td>
<uni-td align="center">{{type == 0?item.purchaseDetails[0].zPrice:0}}</uni-td>
</uni-tr>
</uni-table>
@ -135,8 +135,8 @@
</uni-tr>
<uni-tr @tap="tuihuoDetail(item)">
<uni-td align="center">{{item.userName?item.userName:''}}</uni-td>
<uni-td align="center">{{item.productCount?item.productCount:'0'}}</uni-td>
<uni-td align="center">{{item.totalAmount?item.totalAmount:'0'}}</uni-td>
<uni-td align="center">{{item.returnSaleDetailList[0].productCount?item.returnSaleDetailList[0].productCount:'0'}}</uni-td>
<uni-td align="center">{{item.returnSaleDetailList[0].discountAmount?item.returnSaleDetailList[0].discountAmount:'0'}}</uni-td>
<uni-td align="center">{{type == 0?(item.returnSaleDetailList[0].purchasePrice?item.returnSaleDetailList[0].purchasePrice:'0'):0}}</uni-td>
</uni-tr>
</uni-table>
@ -420,6 +420,13 @@
this.detailList[i].purchaseDetails[m].zPrice = this.detailList[i].purchaseDetails[m].productCount * this.detailList[i].purchaseDetails[m].purchasePrice
}
}
}else if(this.current==3){
for(let i=0;i<this.detailList.length;i++){
this.detailList[i].returnSaleDetailList[0].productCount = 0
for(let m=0;m<this.detailList[i].returnSaleDetailList[0].stockLogList1.length;m++){
this.detailList[i].returnSaleDetailList[0].productCount += this.detailList[i].returnSaleDetailList[0].stockLogList1[m].productCount
}
}
}
this.pages = res.result.pages
@ -492,8 +499,8 @@
console.log('item',item)
if(item){
item.returnSaleDetailList[0].stockLogList = []
for(let i=0;i<item.returnSaleDetailList.length;i++){
item.returnSaleDetailList[0].stockLogList.push(item.returnSaleDetailList[i].stockLogList1[0])
for(let i=0;i<item.returnSaleDetailList[0].stockLogList1.length;i++){
item.returnSaleDetailList[0].stockLogList.push(item.returnSaleDetailList[0].stockLogList1[i])
}
this.GDList = item.returnSaleDetailList[0]
this.$refs.detailPopup.open()

4
pages/login/login.vue

@ -214,7 +214,9 @@
}
} else {
this.getCaptchaImg()
this.tui.toast(res.message)
setTimeout(res=>{
this.tui.toast(res.message)
},1000)
}
}).catch((res) => {

Loading…
Cancel
Save