shish 1 год назад
Родитель
Сommit
75d4374b70

+ 3 - 3
ghsApp/src/admin/billing/result.vue

@@ -31,7 +31,7 @@
         </text>
         <view v-if="item.xhUnitType == 1" style="width:100%;">
           <button class="admin-button-com middle" style="width:180upx;margin:10upx 0 0 0;" @click="partOne(item)">拆1份</button>
-          <button class="admin-button-com middle blue" style="width:180upx;margin:10upx 0 0 20upx;" @click="subHalf(item)">减半</button>
+          <button class="admin-button-com middle blue" style="width:180upx;margin:10upx 0 0 20upx;" @click="subHalf(item)">减半</button>
         </view>
         <button v-else class="admin-button-com middle blue" style="margin:10upx auto 0 auto;" @click="giveItemFn(item)">赠送</button>
       </view>
@@ -129,8 +129,8 @@ export default {
     subHalf(item){
       let that = this
       let orderSn = this.detailInfo.orderSn
-      let remark = "开订单"+orderSn+",减半"
-      that.$util.confirmModal({content:'确认减半?'},() => {
+      let remark = "开订单"+orderSn+",减半"
+      that.$util.confirmModal({content:'确认减半?'},() => {
         changeHalf({productId:item.productId,add:0,remark:remark}).then((res) => {
             that.init()
             let stock = res.data.stock ? res.data.stock : 0

+ 31 - 4
ghsApp/src/admin/item/list2.vue

@@ -111,12 +111,13 @@
 				<view style="width:100vw;margin-top:8upx;"><button @click="preSell()">预售</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="orderRecord()">下单记录</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="copyCreate()">复制新建</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="onStockChange()">路上库存变动</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="sendStock()">分配库存</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="shareItem()">打开分享(批发)</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="getHdPosterFn()">分享海报(批发)</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="getSkPosterFn()">分享海报(零售)</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="ptAuth()">申请平台认证</button></view>
+				<view style="width:100vw;margin-top:8upx;"><button @click="toSubHalf()">减半扎</button></view>
+				<view style="width:100vw;margin-top:8upx;"><button @click="onStockChange()">路上库存变动</button></view>
+				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="ptAuth()">申请平台认证</button></view> -->
 				<view style="width:100vw;margin-top:8upx;"><button @click="delItem()">删除</button></view>
 				<view style="width:100vw;margin-top:30upx;"><button @click="closeRightShow()">取消</button></view>
 			</view>
@@ -144,7 +145,7 @@ import productMins from "@/mixins/product2";
 import { mapGetters } from "vuex";
 import { getWeixinId } from "@/api/invite";
 import { print,cancelDiscountPrice,cancelPreSell,delStatusUpdate,cancelFullOffFn } from '@/api/product';
-import { getHdPoster,getSkPoster,breakItem,changeFrontHide,applyAuth } from '@/api/item'
+import { getHdPoster,getSkPoster,breakItem,changeFrontHide,applyAuth,changeHalf } from '@/api/item'
 import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup.vue';
 import ModalModule from "@/components/plugin/modal"
 export default {
@@ -175,7 +176,9 @@ export default {
 			posterUrl:'',
 			breakNum:'',
 			breakFocus:false,
-			breakShow:false
+			breakShow:false,
+			halfRemark:'',
+			halfRemind:''
 		};
 	},
 	computed:{
@@ -190,6 +193,30 @@ export default {
 		})
 	},
 	methods: {
+		toSubHalf(){
+			let that = this
+			that.$util.confirmModal({content:'请选择操作项',okText:'拆散',cancelText:'报损',cacelTextColor:'#37863a',okTextColor:'#37863a'},() => {
+				that.halfRemark = '拆散减半扎'
+				that.halfRemind = '确认拆散减半?'
+				that.subHalf()
+			},()=>{
+				that.halfRemind = '确认报损减半?'
+				that.halfRemark = '报损减半扎'
+				that.subHalf()
+			})
+		},
+		subHalf(){
+			let that = this
+			that.$util.confirmModal({content:this.halfRemind},() => {
+				that.closeRightShow()
+				uni.showLoading()
+				changeHalf({productId:this.currentInfo.id,add:0,remark:this.halfRemark}).then((res) => {
+					uni.hideLoading()
+					let stock = res.data.stock ? res.data.stock : 0
+					uni.showToast({title: '成功,剩 '+stock,duration:4000,icon:'success'})
+				})
+			})
+		},
 		goSearchFn(){
 			this.searchFn()			
 		},

+ 3 - 3
ghsApp/src/pagesOrder/refund.vue

@@ -24,7 +24,7 @@
 					<input type="number" placeholder="退货数" v-model="res.refundCount" placeholder-style="color:#CCCCCC" style="height:60upx;width:160upx;" />
 					<text style="margin-left:10upx;">{{res.xhUnitName}}</text>
 					<text style="color:green;margin-left:20upx;">可退{{Number(res.xhNum)-Number(res.refundNum)}}{{res.xhUnitName}}</text>
-					<button class="admin-button-com mini-btn" @click="addHalf(res)" v-if="res.xhUnitType == 1" style="margin-left:10upx;">退半</button>
+					<button class="admin-button-com mini-btn" @click="addHalf(res)" v-if="res.xhUnitType == 1" style="margin-left:10upx;">退半</button>
 				</view>
 			</view>
 			</view>
@@ -170,8 +170,8 @@ export default {
 		addHalf(item){
 			let that = this
 			let orderSn = this.orderInfo.orderSn
-			let remark = "售后订单"+orderSn+",退回半"
-			that.$util.confirmModal({content:'确认退回半?'},() => {
+			let remark = "售后订单"+orderSn+",退回半"
+			that.$util.confirmModal({content:'确认退回半?'},() => {
 				uni.showLoading()
 				changeHalf({productId:item.productId,add:1,remark:remark}).then((res) => {
 					uni.hideLoading()