shish 2 lat temu
rodzic
commit
d505967fb7

+ 1 - 1
ghsApp/src/admin/billing/affirm.vue

@@ -579,7 +579,7 @@ export default {
       let that = this
       let formData = this.form;
       const product = this.selectList.map((ele) => {
-        return {productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount, classId: ele.classId, itemId: ele.itemId, price: ele.userPrice}
+        return {productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount, classId: ele.classId, itemId: ele.itemId, price: ele.userPrice,remark:ele.remark}
       });
       formData.product = JSON.stringify(product);
       if (!this.getMerchantInfo) {

+ 3 - 1
ghsApp/src/admin/billing/index2.vue

@@ -88,7 +88,9 @@
 						style="width:86upx;height:86upx;position:absolute;top:300upx;right:40upx;" mode="widthFix"></image>
 
 						<button class="admin-button-com mini-btn" @click="customData.userPrice=0.01;customData.bigCount=1" style="position:absolute;top:200upx;right:33upx;">赠送</button>
-
+					</view>
+					<view class="num_bx">
+						<input style="width: 280upx;height:30upx;font-size:24upx;" v-model="customData.remark" type="text" placeholder="备注" />
 					</view>
 				</view>
 			</template>

+ 4 - 0
ghsApp/src/api/order-item/index.js

@@ -33,4 +33,8 @@ export const getOrderInfoList = data => {
 
 export const filterName = data => {
 	return https.get("/order-item/filter-name", data);
+};
+
+export const updateRemarkItemFn = data => {
+	return https.get("/order-item/update-item-remark", data);
 };

+ 5 - 2
ghsApp/src/components/module/app-commodity2.vue

@@ -85,7 +85,8 @@ export default {
 			ifFocus:false,
 			bigCount:0,
 			smallCount:0,
-			userPrice:0
+			userPrice:0,
+			remark:''
 		};
 	},
 	watch:{
@@ -94,6 +95,7 @@ export default {
 				this.bigCount = newValue.bigCount
 				this.smallCount = newValue.smallCount
 				this.userPrice = newValue.userPrice
+				this.remark = newValue.remark||''
 			},
 			deep:true
 		}
@@ -105,6 +107,7 @@ export default {
 		this.bigCount = this.info.bigCount
 		this.smallCount = this.info.smallCount
 		this.userPrice = this.info.userPrice
+		this.remark = this.info.remark||''
 	},
 	methods: {
 		copyCreate(){
@@ -135,7 +138,7 @@ export default {
 				this.$emit("goToSpecialVariety", this.info);
 				return false
 			}
-			this.$emit("showAddModelFn", { ...this.info, bigCount: this.bigCount, smallCount: this.smallCount, userPrice: this.userPrice})
+			this.$emit("showAddModelFn", { ...this.info, bigCount: this.bigCount, smallCount: this.smallCount, userPrice: this.userPrice,remark:this.remark})
 		}
 	}
 };

+ 5 - 1
ghsApp/src/mixins/product2.js

@@ -22,7 +22,7 @@ export default {
 			globalCheckStock:true,// 考虑库存,盘点不需要考虑库存
 			isAddModel:false,
 			isAddInputFocus:false,
-			customData: { bigCount: 0, smallCount: 0, userPrice: 0,aboutPrice:0,totalPrice:0 },
+			customData: { bigCount: 0, smallCount: 0, userPrice: 0,aboutPrice:0,totalPrice:0,remark:'' },
 			globalItemList:[],
 			globalUnitType:0,
 			globalAllProduct:[],
@@ -214,12 +214,14 @@ export default {
 					that.globalItemData[i].smallCount = selectProduct.smallCount || 0
 					that.globalItemData[i].totalPrice = selectProduct.totalPrice || 0
 					that.globalItemData[i].aboutPrice = selectProduct.aboutPrice || 0
+					that.globalItemData[i].remark = selectProduct.remark || ''
 				}else{
 					that.globalItemData[i].bigCount = 0
 					that.globalItemData[i].userPrice = 0
 					that.globalItemData[i].smallCount = 0
 					that.globalItemData[i].totalPrice = 0
 					that.globalItemData[i].aboutPrice = 0
+					that.globalItemData[i].remark = ''
 				}
 				let cName = ''
 				if(hasExists[currentClassId]){
@@ -273,6 +275,7 @@ export default {
 					arr[index].bigCount = 0;
 					arr[index].smallCount = 0;
 					arr[index].userPrice = 0;
+					arr[index].remark = '';
 				})
 				this.$forceUpdate()
 			}
@@ -378,6 +381,7 @@ export default {
 					list[index].userPrice = item.userPrice
 					list[index].aboutPrice = item.aboutPrice||0
 					list[index].totalPrice = item.totalPrice||0
+					list[index].remark = item.remark||''
 				}
 			}
 			//点击要响声

+ 42 - 6
ghsApp/src/pagesOrder/detail.vue

@@ -216,13 +216,17 @@
 							<text v-if="detailInfo.book == 1" style="position:absolute;left:155upx;top:65upx;color:#999999;">预订 {{ parseFloat(s.xhPreNum) }}{{s.xhUnitName}} x ¥{{ s.xhUnitPrice?parseFloat(s.xhUnitPrice):0 }}</text>
 
 							<text style="position:absolute;left:270upx;top:103upx;color:#333333;">
-								<text v-if="s.giveNum && Number(s.giveNum)>0" style="margin-right:15upx;">已赠 {{parseFloat(s.giveNum)}}{{s.xhUnitName}}</text>
-								<text style="color:red;font-weight: bold;" v-if="Number(s.refundNum)>0">已退{{ s.refundNum }}{{s.xhUnitName}}</text>
+								<text v-if="s.giveNum && Number(s.giveNum)>0" style="margin-right:16upx;">已赠 {{parseFloat(s.giveNum)}}{{s.xhUnitName}}</text>
+								<text style="color:red;font-weight: bold;margin-right:16upx;" v-if="Number(s.refundNum)>0">已退{{ s.refundNum }}{{s.xhUnitName}}</text>
+								<text style="color:#CCCCCC;" @click.stop="beginUpdateItemRemark(s)">
+									{{s.remark}}
+									<text style="color:#3385FF;cursor: pointer;margin-left:5upx;">改备注</text>
+								</text>
 							</text>
 
-							<view class="item-info" @click="pageTo({url:'/admin/item/detail?id='+s.productId})">
+							<view class="item-info">
 								<view class="info-line">
-									<text class="item-name">{{ s.name }}</text>
+									<text class="item-name" @click="pageTo({url:'/admin/item/detail?id='+s.productId})">{{ s.name }}</text>
 									<text class="item-price">
 										<text class="unit"></text>
 										<text class="price">
@@ -398,6 +402,16 @@
 			</view>
 		</uni-popup>
 
+		<uni-popup ref="updateItemRemarkRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+			<view style="padding:30upx;">
+				<textarea v-model="updateItemRemarkText" style="border:1upx solid #cccccc;height:120upx;font-size:28upx;" placeholder="请修改备注"></textarea>
+				<view style="text-align:center;">
+					<button class="admin-button-com big default" style="margin:30upx auto 10upx auto;width:45%;" @click="cancelItemRemarkModify()">取消</button>
+					<button class="admin-button-com big blue" style="margin:30upx auto 10upx 20upx;width:45%;" @click="confirmItemRemarkModify()">修改</button>
+				</view>
+			</view>
+		</uni-popup>
+
 		<modal-module :show="fhLabelShow" @click="fhConfirm" :maskClosable="true" title="物流信息" padding="30rpx 30rpx" >
 			<template v-slot:content>
 				<div class="app-modal-input-wrap">
@@ -433,7 +447,7 @@ import { hasHitNavigate } from "@/api/map";
 import { getWeixinId } from "@/api/invite";
 import { IMGHOST } from '@/config'
 import { partItem } from "@/api/part"
-import { delItem } from "@/api/order-item";
+import { delItem,updateRemarkItemFn } from "@/api/order-item";
 import ModalModule from "@/components/plugin/modal"
 export default {
 	name: "orderDetail",
@@ -464,12 +478,14 @@ export default {
 			givePopShow:false,
 			giveNum:1,
 			modifyRemarkText:'',
+			updateItemRemarkText:'',
 			fhWlInfo:[],
 			fhWlNo:'',
 			fhWl:'顺丰',
 			fhWlFocus:false,
 			fhLabelShow:false,
-			payDate:''
+			payDate:'',
+			currentItem:[]
 		};
 	},
 	onPullDownRefresh() {
@@ -564,6 +580,26 @@ export default {
 				})
 			})
 		},
+		beginUpdateItemRemark(info){
+			this.updateItemRemarkText = info.remark
+			this.currentItem = info
+			this.$refs.updateItemRemarkRef.open('center')
+		},
+		confirmItemRemarkModify(){
+			let that = this
+			uni.showLoading({mask:true})
+			updateRemarkItemFn({id: this.currentItem.id,remark:this.updateItemRemarkText}).then(res=>{
+				uni.hideLoading()
+				if(res.code == 1){
+					that.cancelItemRemarkModify()
+					that.$msg('修改成功')
+					that.init()
+				}
+			})
+		},
+		cancelItemRemarkModify(){
+			this.$refs.updateItemRemarkRef.close()
+		},
 		cancelModify(){
 			this.$refs.modifyRemarkRef.close()
 		},