admingit/PropertyApp
1
0
Fork 0
mirror of https://gitee.com/java110/PropertyApp.git synced 2026-02-23 21:36:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.homecommunity.cn/supervip/PropertyApp

Browse Source
This commit is contained in:
Your Name 2023-03-24 11:36:10 +08:00
commit 1e83de6e57
2 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
components/view-resource-store-info/view-resource-store-info.vue
View File

@ -7,15 +7,21 @@
</view> </view>
<view class="margin-top"> <view class="margin-top">
<view class="cu-list menu-avatar " v-for="(item,index) in resourceList" :key="index"> <view class="cu-list menu-avatar " v-for="(item,index) in resourceList" :key="index">
<view class="cu-item" style="height: 220rpx;"> <view class="cu-item" style="height: 300rpx;">
<view class="content content-left" style="width: 100%;"> <view class="content content-left" style="width: 100%;">
<view class="text-grey flex-around"> <view class="text-grey flex-around">
<text class="ellip text-df">{{item.resName}}({{item.parentRstName}}>{{item.rstName}})</text> <text class="ellip text-df">{{item.resName}}({{item.parentRstName}}>{{item.rstName}})</text>
<text class="item-remove bg-red text-df" @click="_removeItem(index, item.resId)">移除</text> <text class="item-remove bg-red text-df" @click="_removeItem(index, item.resId)">移除</text>
</view> </view>
<view class="text-gray flex-around">
<label class="text-df">价格:</label>
<picker :range="item.times" :range-key="'price'" @change="timesChange($event, index)">
<view>{{item.times[item.selectedTimesIndex].price}}</view>
</picker>
</view>
<view class="text-gray flex-around"> <view class="text-gray flex-around">
<label class="text-df">库存:</label> <label class="text-df">库存:</label>
<text class="text-df">{{item.stock}}{{item.unitCodeName}}</text> <text class="text-df">{{_getTimesStock(item)}}{{item.unitCodeName}}</text>
</view> </view>
<view class="text-gray flex-around"> <view class="text-gray flex-around">
<label class="text-df">数量:</label> <label class="text-df">数量:</label>
@ -104,6 +110,10 @@
_getResourceInfo: function(list){ _getResourceInfo: function(list){
this.resourceList = list; this.resourceList = list;
this.resourceList.forEach((item)=>{ this.resourceList.forEach((item)=>{
item.timesId = '';
item.selectedTimesIndex = 0;
item.selectedTimesStock = 0;
item.times.unshift({timesId: '', price: '请选择'})
this.suppliersList.push(0); this.suppliersList.push(0);
}) })
}, },
@ -116,6 +126,35 @@
this.resourceList.splice(index, 1); this.resourceList.splice(index, 1);
// 通知子组件 取消选中checkbox // 通知子组件 取消选中checkbox
this.$refs.selectresource.removeSelectedItem(resId); this.$refs.selectresource.removeSelectedItem(resId);
},
timesChange: function(e, index){
let timeIndex = e.target.value;
this.resourceList[index].selectedTimesIndex = timeIndex;
if(timeIndex == 0){
this.resourceList[index].timesId = '';
this.resourceList[index].selectedTimesStock = 0;
}else{
this.resourceList[index].timesId = this.resourceList[index].times[timeIndex].timesId;
this.resourceList[index].selectedTimesStock = this.resourceList[index].times[timeIndex].stock;
}
this.$forceUpdate();
},
_getTimesStock: function(_resourceStore) {
if (!_resourceStore.timesId) {
return "-";
}
let _stock = 0;
_resourceStore.times.forEach(_item => {
if (_item.timesId == _resourceStore.timesId) {
_stock = _item.stock;
}
});
if (!_resourceStore.quantity) {
_resourceStore.quantity = '';
}
return _stock;
} }
} }
} }

9
pages/addItemOutStep/addItemOutStep.vue
View File

@ -85,7 +85,12 @@
return; return;
} }
item.quantity = parseInt(item.quantity); item.quantity = parseInt(item.quantity);
if (this.resOrderType == '20000' && (item.quantity > parseInt(item.stock))) { if (this.resOrderType == '20000' && !item.timesId) {
msg = item.resName + ",未选择价格";
_that.onoff = true;
return;
}
if (this.resOrderType == '20000' && (item.quantity > parseInt(item.selectedTimesStock))) {
msg = item.resName + ",库存不足"; msg = item.resName + ",库存不足";
_that.onoff = true; _that.onoff = true;
return; return;
@ -125,8 +130,8 @@
}; };
saveItemOutApply(this, _data) saveItemOutApply(this, _data)
.then(function(res) { .then(function(res) {
if (res.code == 0) {
_that.onoff = true; _that.onoff = true;
if (res.code == 0) {
uni.navigateBack({ uni.navigateBack({
delta:1 delta:1
}) })