Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghs/src/service/product/index.js

@@ -28,18 +28,28 @@ list(data) {
     method: 'POST',
     data: data
   });
+ }
+
+  /** *
+   * 新增花材  姜枫2021.06.22
+   */
+  addProduct(data) {
+      return this.request({
+          url: '/add',
+          method: 'POST',
+          data: data
+      });
   }
-    /** *
-     * 新增花材  姜枫2021.06.22
-     */
-    addProduct(data) {
-        return this.request({
-            url: '/add',
-            method: 'POST',
-            data: data
-        });
-    }
-  
+
+	//花材上下架
+	delStatusUpdate(data) {
+	return this.request({
+	    url: '/del-status-update',
+	    method: 'POST',
+	    data: data
+	});
+	}
+
 }
   
 export default new ProductService();

ghs/src/views/item/list.vue

@@ -453,7 +453,7 @@ export default {
 			this.addDialog = false;
 		},
     setStatusFun(id,type){
-      this.$service.product.update({id:id,delStatus:type}).then(res => {
+      this.$service.product.delStatusUpdate({id:id,delStatus:type}).then(res => {
         this.$message.success('操作成功！')
         this.app.refresh()
       }).catch(err => {})

ghsApp/src/admin/item/list.vue

@@ -82,12 +82,12 @@ export default {
 	onShow(){
 		this.shopId = this.getMyShopInfo.id;
 		let type = '';
-		this.initData({ type, shopId: this.shopId });
+		this.initData({ type, shopId: this.shopId,delStatus:2 });
 	},
 	onLoad() {
 		this.shopId = this.getMyShopInfo.id;
 		let type = '';
-		this.initData({ type, shopId: this.shopId });
+		this.initData({ type, shopId: this.shopId,delStatus:2 });
 	},
 
 	methods: {

ghsApp/src/pagesPurchase/add.vue

@@ -129,7 +129,7 @@ import CommodityPurchase from "./components/CommodityPurchase";
 import ModalModule from "@/components/plugin/modal";
 import FooterCart from "@/components/module/app-footer-cart";
 import productMins from "@/mixins/product";
-
+import { mapGetters } from "vuex";
 // import allMoreSelectInput from "@/components/module/allMoreSelectInput";
 // import allMoreSelectInputMins from "@/mixins/allMoreSelectInput";
 
@@ -165,10 +165,23 @@ export default {
 				itemPrice: null,
 				weight:null,
 				realityWeight:null,
-			}
+			},
+			autoLoad: false, //不自动请求数据  自定义请求
 		};
 	},
-	onLoad() {},
+	computed:{
+		...mapGetters(["getMyShopInfo","getLoginInfo"]),
+	},
+	onShow(){
+		this.shopId = this.getMyShopInfo.id;
+		let type = '';
+		this.initData({ type, shopId: this.shopId,delStatus:2 });
+	},
+	onLoad() {
+		this.shopId = this.getMyShopInfo.id;
+		let type = '';
+		this.initData({ type, shopId: this.shopId,delStatus:2 });
+	},
 	methods: {
 		// 计算重量
 		countWeight(){
@@ -305,7 +318,6 @@ export default {
 				this.customData.smallCount = Math.floor(num % ratioNum);
 			}
 		},
-
 		scrollTop() {}
 	}
 };

ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -131,6 +131,7 @@ import ModalModule from "@/components/plugin/modal";
 import productMins from "@/mixins/product";
 import allMoreSelectInput from "@/components/module/allMoreSelectInput";
 import allMoreSelectInputMins from "@/mixins/allMoreSelectInput";
+import { mapGetters } from "vuex";
 export default {
 	name: "allotEx", // 开单
 	components: {
@@ -167,17 +168,29 @@ export default {
 				bigCount: 0,
 				smallCount: 0
 			},
-			showSubmitModel: false
+			showSubmitModel: false,
+			autoLoad: false, //不自动请求数据  自定义请求
 		};
 	},
 	computed: {
 		confirmContent() {
 			let content = "确认下一步？";
-
 			return content;
 		}
 	},
-
+	computed:{
+		...mapGetters(["getMyShopInfo","getLoginInfo"]),
+	},
+	onShow(){
+		this.shopId = this.getMyShopInfo.id;
+		let type = '';
+		this.initData({ type, shopId: this.shopId,delStatus:2 });
+	},
+	onLoad() {
+		this.shopId = this.getMyShopInfo.id;
+		let type = '';
+		this.initData({ type, shopId: this.shopId,delStatus:2 });
+	},
 	methods: {
 		//自定义数量
 		customNum(info) {
@@ -191,7 +204,6 @@ export default {
 				this.isFocus = true;
 			})
 
-
 			// this.$nextTick(()=>{
 			// 	this.initAllInput();
 			// })
@@ -199,7 +211,8 @@ export default {
 		modalCancel() {
 			this.isModel = false;
 			this.customData = {};
-		}, // 取消 确认
+		},
+		// 取消 确认
 		affirm(val) {
 			this.isFocus = false;
 			this.isFocusOne = false;
@@ -223,9 +236,7 @@ export default {
 				}
 				this.updateItemEvent(this.customData);
 				this.modalCancel();
-				
 			})
-
 		},
 		cancelEvent() {
 			this.showSubmitModel = false;

ghsApp/src/pagesStorehouse/stockWarn/manage.vue

@@ -131,7 +131,7 @@ export default {
 		if(type=="waring"){
 			this.initDataContrapose({ type, shopId: this.shopId });
 		}else{
-			this.initData({ type, shopId: this.shopId });
+			this.initData({ type, shopId: this.shopId,delStatus:2});
 		}
 
 	},
@@ -158,7 +158,7 @@ export default {
 					uni.hideLoading();
 					// this.initDataContrapose({ type, shopId: this.shopId });
 				}else{
-					this.initData({ type, shopId: this.shopId });
+					this.initData({ type, shopId: this.shopId,delStatus:2 });
 				}
 			}
 		},