root
/
kuaiyidian-HD
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

11

master
wangfukang 2 years ago
parent
7970739db1
commit
78999285ee
7 changed files with 36 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      pages/index/customAndSupplierProductDetail.vue
  2. 13
      pages/index/dataStatistics.vue
  3. 5
      pages/index/index.vue
  4. 4
      pages/index/waitStorage.vue
  5. 7
      pages/inventory/goodsList1.vue
  6. 12
      pages/inventory/inventoryDetail.vue
  7. 5
      pages/login/login.vue

9
pages/index/customAndSupplierProductDetail.vue
View File

@ -494,7 +494,7 @@
<view style="display: flex;position: relative;">
<view
style="margin-top: 40rpx;width: 100rpx;height: 100rpx;border-radius: 80rpx;background: #8470FF;color: #fff;font-size: 26rpx;padding: 17rpx 24rpx;margin: 35rpx 0 0 35rpx;">
{{item.dealingsType == 0 ?"销售开单" :item.dealingsType == 1 ?"退货" :item.dealingsType == 2 ?"回款" :item.dealingsType == 3 && item.amount< 0?"初始余额" :item.dealingsType == 3 && item.amount>= 0?"初始欠款" :item.dealingsType == 4 ?"充值金额" :item.dealingsType == 5 ?"追加欠款" :item.dealingsType == 6 ?"撤销订单" :item.dealingsType == 7 ?"采购订单" :""}}
{{item.dealingsType == 0 ?"销售开单" :item.dealingsType == 1 ?"退货" :item.dealingsType == 2 ?"回款" :item.dealingsType == 3 && item.amount< 0?"初始余额" :item.dealingsType == 3 && item.amount>= 0?"初始欠款" :item.dealingsType == 4 ?"充值金额" :item.dealingsType == 5 ?"追加欠款" :item.dealingsType == 6 ?"撤销订单" :item.dealingsType == 7 ?"采购订单" :item.dealingsType == 9 ?"采购退货":""}}
</view>
<view style="height: 170rpx;line-height: 50rpx;padding-left: 30rpx;">
<view
@ -556,7 +556,8 @@
<view>
<view>
<view style="padding-left: 20rpx;">
<text>拿货金额:{{item.shouldPay == null ?"0" :item.shouldPay}}</text>
<text v-if="item.dealingsType == 9">退货金额:{{item.shouldPay == null ?"0" :item.shouldPay}}</text>
<text v-else>拿货金额:{{item.shouldPay == null ?"0" :item.shouldPay}}</text>
</view>
</view>
<view style="padding-left: 20rpx;margin-top: 40rpx;">
@ -583,12 +584,12 @@
</view>
<view v-if="item.dealingsType == 5 || item.amount >= 0"
style="flex: 1;border-left: 1px solid #eee;display: flex;flex-direction: column;">
<text>{{item.dealingsType == 5?'追加欠款':item.dealingsType == 4?'充值金额':item.dealingsType == 6?'撤销欠款':'本单欠款'}}</text>
<text>{{item.dealingsType == 5?'追加欠款':item.dealingsType == 4?'充值金额':item.dealingsType == 6?'撤销欠款':item.dealingsType == 9?'本单退款':'本单欠款'}}</text>
<text>{{item.amount == null ?"0" :item.dealingsType == 5?Math.abs(item.amount):item.amount}}</text>
</view>
<view v-if="item.amount < 0 && item.dealingsType != 5"
style="flex: 1;border-left: 1px solid #eee;display: flex;flex-direction: column;">
<text>{{item.dealingsType == 4?'充值金额':item.dealingsType == 6?'撤销余额':'本单余额'}}</text>
<text>{{item.dealingsType == 4?'充值金额':item.dealingsType == 6?'撤销余额':item.dealingsType == 9?'本单退款':'本单余额'}}</text>
<text>{{item.amount == null ?"0" :Math.abs(item.amount)}}</text>
</view>
<view v-if="item.balanceDue >= 0"

13
pages/index/dataStatistics.vue
View File

@ -116,9 +116,16 @@
},
methods: {
goDetail(item){
uni.navigateTo({
url:'/package1/index/statisticsDetail?value='+ item.value + '&range=' + JSON.stringify(this.range)
})
if(item.value == 'lirun'){
uni.navigateTo({
url:'/package1/index/lirun?value='+ item.value + '&range=' + JSON.stringify(this.range)
})
}else{
uni.navigateTo({
url:'/package1/index/statisticsDetail?value='+ item.value + '&range=' + JSON.stringify(this.range)
})
}
},
getSaleInfo() {
this.shopInfo = {}

5
pages/index/index.vue
View File

@ -142,7 +142,7 @@
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="采购退货"
<u-cell icon="man-add-fill" url="/package1/inventory/inventoryReturnList" 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>
@ -514,7 +514,8 @@
if (res.code == 200) {
this.returnList = new Map()
res.result.noEarn = res.result.amountOwed
res.result.name = res.result.userName
res.result.name = res.result.userName
res.result.id = item.userId
uni.setStorageSync('khName', JSON.stringify(res.result))
uni.setStorageSync('carList1', JSON.stringify(dataList))
uni.setStorageSync('hangOrder', true)

4
pages/index/waitStorage.vue
View File

@ -186,7 +186,7 @@
obj.saleDetailQueryDTO = newSaleDetailDTOList
obj.num = 0
obj.id = res1.result.purchaseDetails[i].productId
obj.purchasePrice = res1.result.purchaseDetails[i].purchasePrice
obj.purchasePrice = res1.result.purchaseDetails[i].stockLogList1[0].purchasePrice
obj.price = res1.result.purchaseDetails[i].price
obj.categoryId = res1.result.purchaseDetails[i].categoryId
obj.productName = res1.result.purchaseDetails[i].productName
@ -210,7 +210,7 @@
obj.createByName = item.createByName
dataList.push(obj)
}
uni.setStorageSync('AiInventoryId', res1.result.purchase.id)
uni.setStorageSync('AiInventoryId',"")
}
}).catch((res1) => {})
console.log('dataList',dataList)

7
pages/inventory/goodsList1.vue
View File

@ -413,7 +413,7 @@
<uni-data-select class="uni-data-select" :localdata="categoryList" v-model="xsyId"
placeholder="请选择销售员" @change="categoryChange"></uni-data-select>
</view>
<view class="shop-box">
<!-- <view class="shop-box">
<view class="" style="border-bottom: 1px solid #eee;">
<view class="list-name" style="width: 100%;">发货方式</view>
<view class="list-val" style="width: 100%;padding-left:20rpx;height:200rpx;">
@ -489,7 +489,7 @@
</view>
</view>
</view>
</view>
</view> -->
</view>
</scroll-view>
<!-- </view> -->
@ -6854,8 +6854,9 @@
this.khName = {
id: res.result.records[0].id,
name: res.result.records[0].name,
noEarn: null
noEarn: res.result.records[0].noEarn
}
this.zhiqianqiankuan = res.result.records[0].noEarn
} else {
this.khName = {}
this.tui.toast(res.message)

12
pages/inventory/inventoryDetail.vue
View File

@ -91,7 +91,7 @@
</view>
</view>
<view v-show="current === 2">
<view v-for="(item,index) in detailList" :key="index">
<view v-for="(item,index) in detailList" :key="index" @tap="goDetail(item)">
<view style="width: 100%;height: 80rpx;line-height: 80rpx;">
<text style="display:inline-block;width: 55%;text-align: center;font-weight: bold;font-size: 30rpx;">
{{item.purchase.createTime}}
@ -107,9 +107,9 @@
<uni-th align="center" width="70">进货价</uni-th>
<uni-th align="center" width="70">总价</uni-th>
</uni-tr>
<uni-tr @tap="rukuDetail(item.purchaseDetails[0])">
<uni-tr>
<uni-td align="center">{{item.purchase.supplierName}}</uni-td>
<uni-td align="center">{{item.purchase.totalAmount}}</uni-td>
<uni-td align="center" @tap.stop="rukuDetail(item.purchaseDetails[0])"><text style="color:blue;text-decoration: underline;">{{item.purchase.totalAmount}}</text></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>
@ -639,6 +639,12 @@
delta: 1
})
})
},
goDetail(item){
// uni.setStorageSync('noReload',true)
uni.navigateTo({
url: '/package1/index/waitStorageDetail?id=' + item.purchase.id
})
},
onPrint1(opt) {
let that = this

5
pages/login/login.vue
View File

@ -213,10 +213,11 @@
this.checkShop(res.result.shopList[0])
}
} else {
this.getCaptchaImg()
setTimeout(res=>{
this.tui.toast(res.message)
},1000)
},1000)
this.getCaptchaImg()
}
}).catch((res) => {

Write Preview
Loading…
Cancel
Save