shish 3 лет назад
Родитель
Сommit
7ff444a284

+ 3 - 3
hdApp/src/admin/goods/pdGoods.vue

@@ -113,7 +113,7 @@ export default {
 
       }else{
         this.form.catId = 0
-        getCategoryToGoods({status:'',page:this.list.page,...this.form,flower:0,searchText:this.searchText}).then(res => {
+        getCategoryToGoods({status:'',page:this.list.page,...this.form,flower:'',searchText:this.searchText}).then(res => {
           this.completes(res)
         })
       }
@@ -134,7 +134,7 @@ export default {
       this.getPlantClass()
     },
     getPlantClass() {
-      categoryListInfo({flower:0}).then(res => {
+      categoryListInfo({flower:''}).then(res => {
         this.tabbar = res.data;
         if(this.tabbar && this.tabbar[0] && this.tabbar[0].id){
           this.form.catId = this.tabbar[0].id
@@ -143,7 +143,7 @@ export default {
       })
     },
     getPlantList() {
-      return getCategoryToGoods({status:'',page:this.list.page,...this.form,flower:0,searchText:this.searchText}).then(res => {
+      return getCategoryToGoods({status:'',page:this.list.page,...this.form,flower:'',searchText:this.searchText}).then(res => {
         this.completes(res)
       })
     },

+ 2 - 2
hdApp/src/admin/goods/pdGoodsConfirm.vue

@@ -19,10 +19,10 @@
 									</view>
 								</view>
 								<view v-else-if="column.custom == 'stock'">
-									<text v-if="Number(item.stock)>0">{{item.stock}}</text>
+									<text>{{item.stock}}</text>
 								</view>
 								<view v-else-if="column.custom == 'inventory'">
-									<text v-if="Number(item.bigCount)>0">{{item.bigCount==99999?0:item.bigCount}}</text>
+									<text>{{item.bigCount==99999?0:item.bigCount}}</text>
 								</view>
 								<view v-else-if="column.custom == 'profit'">
 									<text></text>

+ 12 - 1
hdApp/src/admin/goods/stockChange.vue

@@ -16,7 +16,13 @@
 							<t-td><view>{{ item.addTime.substr(5,11) }}</view></t-td>
 							<t-td><view>{{item.relateName}}</view></t-td>
 							<t-td><view style="width:180upx;">{{item.typeName}}</view></t-td>
-							<t-td><view>{{parseFloat(item.goodsNum)}}</view></t-td>
+							<t-td>
+								<view>
+									<text v-if="item.io == 1">+</text>
+									<text v-if="item.io == 0">-</text>
+									{{parseFloat(item.goodsNum)}}
+								</view>
+							</t-td>
 							<t-td><view>{{parseFloat(item.newStock)}}</view></t-td>
 						</t-tr>
 					</t-table>
@@ -68,6 +74,11 @@ export default {
 	},
 	onLoad(e) {
 		this.params.id = e.id
+
+		if(this.option.name){
+			uni.setNavigationBarTitle({ title: this.option.name+' 库存变动' })
+		}
+
 	},
 	onReachBottom() {
 		if (!this.list.finished) {

+ 3 - 3
hdApp/src/admin/item/components/Item.vue

@@ -22,7 +22,7 @@
 	</view>
 	<text class="bottom-button" @click.stop="moreAction(info)">更多</text>
 	<text class="bottom-button" @click.stop="goToOrderDetail(info.id)">下单记录</text>
-	<text class="bottom-button" @click.stop="goToStockDetail(info.id)">库存变动</text>
+	<text class="bottom-button" @click.stop="goToStockDetail(info)">库存变动</text>
 </view>
 </template>
 <script>
@@ -56,8 +56,8 @@ export default {
 		goToOrderDetail(id){
 			this.$util.pageTo({url: "/admin/order/itemOrder?id="+id})
 		},
-		goToStockDetail(id){
-			this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+id})
+		goToStockDetail(item){
+			this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+item.id+'&name='+item.name})
 		},
 		goToProduct(id) {
 			// #ifdef MP-WEIXIN

+ 1 - 1
hdApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -123,7 +123,7 @@ export default {
 		this.shopId = this.getLoginInfo.shopId;
 
 		if(this.option.name){
-			uni.setNavigationBarTitle({ title: this.option.name })
+			uni.setNavigationBarTitle({ title: this.option.name+' 库存变动' })
 		}
 
 	},