diff --git a/pages/stock/agrWarehouse.vue b/pages/stock/agrWarehouse.vue index 2827570..5caf623 100644 --- a/pages/stock/agrWarehouse.vue +++ b/pages/stock/agrWarehouse.vue @@ -3,21 +3,83 @@ min-height:100%; background:#f6f6f6; padding:30rpx 0; + + &.agr{ + padding:30rpx; + background:#fff; + } + &>.agrInfo{ + margin-top:0; + .data{ + display:flex; + align-items: center; + margin-bottom:16rpx; + text{ + &:first-child{ + flex-shrink: 0; + color:#fff; + background:#10C176; + border-radius: 6rpx; + min-width:80rpx; + height:40rpx; + line-height: 40rpx; + text-align: center; + font-size:20rpx; + margin-right:16rpx; + } + &:nth-child(3){ + background:#10C176; + border-radius: 50%; + width:36rpx; + height:36rpx; + text-align: center; + line-height: 36rpx; + color:#fff; + margin-left:auto; + } + } + } + } + .u-form{ + &.card{ + margin:30rpx 30rpx 0; + } + &>.addAgr{ + color:#10C176; + background:rgba(16, 193, 119, 0.1); + border-radius: 24rpx; + height:100rpx; + display:flex; + align-items: center; + justify-content: space-between; + padding:30rpx; + margin-bottom:28rpx; + } + } } @@ -26,10 +88,12 @@ data(){ return{ fields:{ + scpect:{label:"规格", type:"select", columns:[[]],value:[],agr:true}, + num:{label:"入库数量", type:"number",suffix:"袋", tip:"共计:40kg",agr:true}, type:{label:"入库类型"}, date:{label:"入库时间"}, - imgs:{label:"单据、凭证图片",type:"upImg",columns:[[]],value:''}, - remarks:{label:"备注"}, + imgs:{label:"单据、凭证图片",type:"upImg",value:''}, + remarks:{label:"备注",type:"textarea"}, }, formData:{ type:"", @@ -41,7 +105,8 @@ type:{required:true}, date:{required:true}, imgs:{required:true}, - } + }, + isAgr: false, } }, onLoad(){}, diff --git a/pages/stock/record.vue b/pages/stock/record.vue index 35f0067..60b7383 100644 --- a/pages/stock/record.vue +++ b/pages/stock/record.vue @@ -84,7 +84,7 @@ export default { data(){ return{ searchVal:{ - baseId: "1611250480973049857",//this.$store.state.plantBaseInfoId, + baseId: this.$store.state.plantBaseInfoId, pageNo:1, pageSize:6, },