停止预售

ghsApp/src/admin/changePrice/components/Item.vue

@@ -25,8 +25,12 @@
 						<view class="sk-price-area">
 							<input class="change-input" @click.stop @blur="saveSkPrice" placeholder-style="color:#CCCCCC" v-model="skModifyPrice" type="digit" placeholder="散客价" />
 						</view>
-						<button v-if="Number(info.discountPrice)>0" @click.stop="cancelDiscountFn(info)" class="admin-button-com mini-btn blue" 
-							style="position:absolute;bottom:-8upx;font-size:24upx;left:10upx;">取消特价</button>
+						<button v-if="Number(info.discountPrice)>0 && info.presell == 0" @click.stop="cancelDiscountFn(info)" class="admin-button-com mini-btn blue" 
+							style="position:absolute;bottom:-9upx;font-size:24upx;left:10upx;">恢复原价</button>
+
+						<button v-if="info.presell == 1" @click.stop="cancelPreSellFn(info)" class="admin-button-com mini-btn blue" 
+							style="position:absolute;bottom:-9upx;font-size:24upx;left:10upx;">停止预售</button>
+
 					</view>
 				</view>
 			</view>
@@ -76,6 +80,9 @@ export default {
 	mounted(){
 	},
 	methods: {
+		cancelPreSellFn(item){
+			this.$emit("cancelPreSellFn",item)
+		},
 		cancelDiscountFn(item){
 			this.$emit("cancelDiscountFn",item)
 		},

ghsApp/src/admin/changePrice/list.vue

@@ -34,7 +34,7 @@
 
 							<template v-for="(productItem, productIndex) in classItem.child">
 								<view style="height:230upx" :id="`class_${classIndex}`" :key="productIndex">
-									<ItemComponent v-if="classItem.isActive" :isPrice="false" :info="productItem" @savePrice="savePrice" @cancelDiscountFn="cancelDiscountFn"></ItemComponent>
+									<ItemComponent v-if="classItem.isActive" :isPrice="false" :info="productItem" @savePrice="savePrice" @cancelDiscountFn="cancelDiscountFn" @cancelPreSellFn="cancelPreSellFn"></ItemComponent>
 								</view>
 							</template>
 
@@ -82,7 +82,7 @@ import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import ItemComponent from "./components/Item";
 import productMins from "@/mixins/product";
 import { mapGetters } from "vuex";
-import { batchChangePrice,generatePriceTable,cancelDiscountPrice } from '@/api/product/index'
+import { batchChangePrice,generatePriceTable,cancelDiscountPrice,cancelPreSell } from '@/api/product'
 export default {
 	name: "item_list",
 	components: {
@@ -116,10 +116,20 @@ export default {
 		},
 		hideClassRemind(){
 
+		},
+		cancelPreSellFn(){
+			let that = this
+			this.$util.confirmModal({content:'确认停止预售？'},() => {
+				cancelPreSell({id:item.id}).then(res=>{
+					if(res.code == 1){
+						that.$msg(res.msg)
+					}
+				})
+			})
 		},
 		cancelDiscountFn(item){
 			let that = this
-			this.$util.confirmModal({content:'确认取消？'},() => {
+			this.$util.confirmModal({content:'确认恢复原价？'},() => {
 				cancelDiscountPrice({id:item.id}).then(res=>{
 					if(res.code == 1){
 						that.$msg(res.msg)

ghsApp/src/admin/item/components/item.vue

@@ -23,6 +23,13 @@
 					<view class="open-bx">
 						还剩 <text style="font-size:23upx;margin-left:8upx;">{{ info.stock?parseFloat(info.stock):0 }}</text>
 						<text style="margin-left:28upx;font-size:23upx;display:inline-block;color:#999;">销量 {{ info.actualSold ? parseInt(info.actualSold) : 0 }}</text>
+
+						<button v-if="Number(info.discountPrice)>0 && info.presell == 0" @click.stop="cancelDiscountFn(info)" class="admin-button-com mini-btn blue" 
+							style="position:absolute;bottom:-9upx;font-size:24upx;left:10upx;">恢复原价</button>
+
+						<button v-if="info.presell == 1" @click.stop="cancelPreSellFn(info)" class="admin-button-com mini-btn blue" 
+							style="position:absolute;bottom:-9upx;font-size:24upx;left:10upx;">停止预售</button>
+
 					</view>
 				</template>
 			</view>
@@ -49,6 +56,12 @@ export default {
 		};
 	},
 	methods: {
+		cancelPreSellFn(item){
+			this.$emit("cancelPreSellFn",item)
+		},
+		cancelDiscountFn(item){
+			this.$emit("cancelDiscountFn",item)
+		},
 		moreAction(item){
 			this.$emit('moreAction', item)
 		},

ghsApp/src/admin/item/detail.vue

@@ -21,7 +21,8 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">花店价</view>
-          <input v-model="form.price" placeholder-class="phcolor" class="tui-input" name="price" @focus="form.price=''" placeholder="请填写" type="digit" />
+          <input v-model="form.price" style="width:260upx;" placeholder-class="phcolor" class="tui-input" name="price" @focus="form.price=''" placeholder="请填写" type="digit" />
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goPriceDetail(productData)">价格变动记录</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -35,6 +36,12 @@
           <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData)">库存变动记录</button>
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :arrow="false">
+          <view class="tui-title">成本</view>
+          <view style="width:260upx;height:45upx;">{{ productData.cost?parseFloat(productData.cost):0 }}</view>
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goCostDetail(productData)">成本变动记录</button>
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :arrow="true">
           <view class="tui-title">分类</view>
           <picker mode="selector" :value="form.classId" :range="itemClassData" range-key="name" @change="changeItemClassFn" class="tui-input" >
@@ -46,19 +53,22 @@
         <tui-list-cell class="line-cell" :arrow="false">
           <view class="tui-title">大单位</view>
           <input v-model="form.bigUnitId" name="bigUnitId" type="text" hidden />
-          <view v-if="form.bigUnitId" @click="$msg('不可修改')" style="color:#CCCCCC;width:450upx;height:45upx;">{{ bigUnitSelectedData.name }}</view>
+          <view v-if="form.bigUnitId" @click="$msg('不可修改')" style="width:300upx;color:#CCCCCC;height:45upx;">{{ bigUnitSelectedData.name }}</view>
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="modify(productData.id)">修改</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :arrow="false">
           <view class="tui-title">小单位</view>
           <input v-model="form.smallUnitId" name="smallUnitId" type="text" hidden />
-          <view v-if="form.smallUnitId" @click="$msg('不可修改')" style="color:#CCCCCC;width:450upx;height:45upx;">{{ smallUnitSelectedData.name }}</view>
+          <view v-if="form.smallUnitId" @click="$msg('不可修改')" style="width:300upx;color:#CCCCCC;height:45upx;">{{ smallUnitSelectedData.name }}</view>
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="modify(productData.id)">修改</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">单位比</view>
-          <input v-model="form.ratio" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="color:#CCCCCC;"
+          <input v-model="form.ratio" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="width:300upx;color:#CCCCCC;"
           class="tui-input" name="ratio" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="modify(productData.id)">修改</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -72,8 +82,9 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">每扎重量</view>
-          <input v-model="form.weight" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="color:#CCCCCC;"
+          <input v-model="form.weight" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="width:300upx;color:#CCCCCC;"
           class="tui-input" name="weight" placeholder="单位为公斤，参考红玫每扎1.2公斤" maxlength="50" type="digit" />
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="modify(productData.id)">修改</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -274,6 +285,9 @@ export default {
 		blur() {
 			this.printFocus = false
 		},
+    modify(){
+      this.$msg('功能开发中，请联系管理员修改')
+    },
 		doPrintLabel(id){
 			this.printItemId = id
 			this.printLabelShow = true
@@ -329,6 +343,12 @@ export default {
     notModify(){
       this.$msg('不可修改')
     },
+    goPriceDetail(item){
+      this.$util.pageTo({url: "/admin/changePrice/changeList?id="+item.id})
+    },
+    goCostDetail(item){
+      this.$util.pageTo({url: "/admin/changePrice/costChangeList?id="+item.id})
+    },
     goStockDetail(item){
 				this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+item.id+'&name='+item.name})
 		},

ghsApp/src/admin/item/list.vue

@@ -27,7 +27,7 @@
 							<view v-if="classItem.child && !$util.isEmpty(classItem.child)">
 								<template v-for="(productItem, productIndex) in classItem.child">
 									<view style="height:255upx" :id="`class_${classIndex}`" :key="productIndex">
-										<ItemStock v-if="classItem.isActive" :info="productItem" @moreAction="moreAction" @doPrintLabel="doPrintLabel" >
+										<ItemStock v-if="classItem.isActive" :info="productItem" @moreAction="moreAction" @doPrintLabel="doPrintLabel" @cancelDiscountFn="cancelDiscountFn" @cancelPreSellFn="cancelPreSellFn">
 										</ItemStock>
 									</view>
 								</template>
@@ -107,7 +107,7 @@ import ItemStock from "./components/item";
 import productMins from "@/mixins/product";
 import { mapGetters } from "vuex";
 import { getWeixinId } from "@/api/invite/index";
-import { print } from '@/api/product';
+import { print,cancelDiscountPrice,cancelPreSell } from '@/api/product';
 import { getHdPoster,getSkPoster } from '@/api/item'
 import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup.vue';
 import ModalModule from "@/components/plugin/modal"
@@ -156,6 +156,26 @@ export default {
 		})
 	},
 	methods: {
+		cancelPreSellFn(){
+			let that = this
+			this.$util.confirmModal({content:'确认停止预售？'},() => {
+				cancelPreSell({id:item.id}).then(res=>{
+					if(res.code == 1){
+						that.$msg(res.msg)
+					}
+				})
+			})
+		},
+		cancelDiscountFn(item){
+			let that = this
+			this.$util.confirmModal({content:'确认恢复原价？'},() => {
+				cancelDiscountPrice({id:item.id}).then(res=>{
+					if(res.code == 1){
+						that.$msg(res.msg)
+					}
+				})
+			})
+		},
 		closePoster(){
 			this.$refs.posterShow.close()
 		},

ghsApp/src/api/product/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const cancelPreSell = data => {
+	return https.get("/product/cancel-pre-sell", data);
+};
+
 export const changePresell = data => {
 	return https.post("/product/change-presell", data);
 };