更新

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

@@ -61,7 +61,7 @@
 		<text style="position:absolute;left:40upx;">毛利 ￥{{ info.ml ? parseFloat(info.ml) : 0 }}</text>
 		<text style="position:absolute;right:50upx;">成本 ￥{{ info.avCost?parseFloat(info.avCost):0 }}</text>
 	</view>
-	<item-remark-bar :text="info.itemRemark" />
+	<item-remark-bar :text="info.itemRemark" :item-id="info.id" :info="info" />
 
 </view>
 </template>

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

@@ -36,7 +36,7 @@
 			</view>
 		</view>
 	</view>
-	<item-remark-bar :text="info.itemRemark" />
+	<item-remark-bar :text="info.itemRemark" :item-id="info.id" :info="info" />
 </view>
 </template>
 <script>

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

@@ -36,7 +36,7 @@
 			</view>
 		</view>
 	</view>
-	<item-remark-bar :text="info.itemRemark" />
+	<item-remark-bar :text="info.itemRemark" :item-id="info.id" :info="info" />
 </view>
 </template>
 <script>

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

@@ -37,7 +37,7 @@
 			</view>
 		</view>
 	</view>
-	<item-remark-bar :text="info.itemRemark" />
+	<item-remark-bar :text="info.itemRemark" :item-id="info.id" :info="info" />
 </view>
 </template>
 

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

@@ -40,7 +40,7 @@
 			</text>
 		</view>
 	</view>
-	<item-remark-bar :text="info.itemRemark" />
+	<item-remark-bar :text="info.itemRemark" :item-id="info.id" :info="info" />
 
 </view>
 </template>

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

@@ -28,7 +28,7 @@
 			</view>
 		</view>
 	</view>
-	<item-remark-bar :text="info.itemRemark" />
+	<item-remark-bar :text="info.itemRemark" :item-id="info.id" :info="info" />
 </view>
 </template>
 <script>

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

@@ -35,7 +35,7 @@
 			</view>
 		</view>
 	</view>
-	<item-remark-bar :text="info.itemRemark" />
+	<item-remark-bar :text="info.itemRemark" :item-id="info.id" :info="info" />
 </view>
 </template>
 <script>

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

@@ -54,7 +54,7 @@
 			</view>
 		</view>
 	</view>
-	<item-remark-bar :text="info.itemRemark" />
+	<item-remark-bar :text="info.itemRemark" :item-id="info.id" :info="info" />
 	<text class="bottom-button" @click.stop="moreAction(info)">更多</text>
 	<text class="bottom-button" @click.stop="goToStockDetail(info)">库明细</text>
 	<text class="bottom-button" @click.stop="hideChangeFn(info)">{{ frontHide == 0 ? '隐藏' : '显示' }}</text>

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

@@ -75,7 +75,7 @@
 		</view>
 	</view>
 
-	<item-remark-bar :text="info.itemRemark" />
+	<item-remark-bar :text="info.itemRemark" :item-id="info.id" :info="info" />
 
 	<view class="bottom-buttons-container">
 		<text class="bottom-button" @click.stop="doPrintLabel(info,1)">价码</text>

ghsApp/src/components/module/app-commodity.vue

@@ -50,7 +50,7 @@
 			</view>
 		</view>
 	</view>
-	<item-remark-bar :text="info.itemRemark" />
+	<item-remark-bar :text="info.itemRemark" :item-id="info.id" :info="info" />
 	</view>
 </template>
 <script>

ghsApp/src/components/module/itemRemarkBar.vue

@@ -4,22 +4,68 @@
 		<view class="item-remark-bar__text-wrap">
 			<text class="item-remark-bar__text">{{ displayText }}</text>
 		</view>
+		<text
+			v-if="showCancelBtn"
+			class="item-remark-bar__cancel"
+			@click.stop="onCancelRemark"
+		>取消</text>
 	</view>
 </template>
 
 <script>
+import { clearItemRemark } from '@/api/item'
+
 export default {
 	name: 'ItemRemarkBar',
 	props: {
 		text: {
 			type: String,
 			default: ''
+		},
+		itemId: {
+			type: [Number, String],
+			default: ''
+		},
+		info: {
+			type: Object,
+			default: null
+		},
+		cancelable: {
+			type: Boolean,
+			default: true
 		}
 	},
 	computed: {
 		displayText() {
 			const t = this.text == null ? '' : String(this.text).trim()
 			return t
+		},
+		showCancelBtn() {
+			return this.cancelable && !!this.itemId
+		}
+	},
+	methods: {
+		onCancelRemark() {
+			const id = this.itemId
+			if (!id) {
+				return
+			}
+			this.$util.confirmModal({ content: '确定取消备注？' }, () => {
+				clearItemRemark({ id }).then(res => {
+					if (res.code == 1) {
+						if (this.info) {
+							this.$set(this.info, 'itemRemark', '')
+						}
+						this.$emit('cleared', id)
+						uni.showToast({
+							title: res.msg || '已取消备注',
+							duration: 1500
+						})
+					} else if (res.msg) {
+						this.$msg(res.msg)
+					}
+				})
+			})
 		}
 	}
 }
@@ -65,4 +111,13 @@ export default {
 	white-space: nowrap;
 	text-overflow: ellipsis;
 }
+.item-remark-bar__cancel {
+	flex-shrink: 0;
+	font-size: 26upx;
+	color: #3385ff;
+	line-height: 48upx;
+	padding-left: 12upx;
+	margin-right: 10upx;
+	white-space: nowrap;
+}
 </style>

ghsApp/src/pagesPurchase/components/CommodityPurchase.vue

@@ -48,7 +48,7 @@
         </view>
       </view>
     </view>
-    <item-remark-bar :text="info.itemRemark" />
+    <item-remark-bar :text="info.itemRemark" :item-id="info.id" :info="info" />
 
     <text class="bottom-button" @click.stop="copyCreate(info)">复制新建</text>
     <text class="bottom-button" @click.stop="goToStockDetail(info)">库存明细</text>

ghsApp/src/pagesStorehouse/components/pdItem2.vue

@@ -52,7 +52,7 @@
 			</view>
 		</view>
 	</view>
-	<item-remark-bar :text="info.itemRemark" />
+	<item-remark-bar :text="info.itemRemark" :item-id="info.id" :info="info" />
 	</view>
 </template>
 <script>