diff --git a/common/style/new_style.css b/common/style/new_style.css
index 20c52a66..d7541d69 100644
--- a/common/style/new_style.css
+++ b/common/style/new_style.css
@@ -2027,15 +2027,14 @@ button::after {
.card_itemCode {
font-size: 36rpx;
- font-weight: 500;
+ /* font-weight: 500; */
padding: 10rpx;
-
}
.card_itemName {
color: #909399;
font-size: 30rpx;
- padding: 0rpx 10rpx;
+ padding: 0rpx 20rpx;
}
/* .std_pack {
diff --git a/mycomponents/recommend/recommend.vue b/mycomponents/recommend/recommend.vue
index e969ccfe..858dc116 100644
--- a/mycomponents/recommend/recommend.vue
+++ b/mycomponents/recommend/recommend.vue
@@ -4,17 +4,13 @@
-
+
-
+
-
+
- 复制箱码
+
+ 复制采购标签
- 复制制品
+
+ 复制制品标签
@@ -75,7 +73,7 @@
type: Boolean,
default: false
},
-
+
locationTitle: {
type: String,
default: '库位'
@@ -104,13 +102,13 @@
var content = "HMQ;V1.0;I" + this.detail.itemCode + ";P" + this.detail.packingNumber + ";B" + this.detail
.batch + ";Q" + this.detail.qty
this.$copyText(content).then(
- res => {
- uni.showToast({
- title: '复制成功',
- icon: 'none'
- })
- }
- )
+ res => {
+ uni.showToast({
+ title: '复制成功',
+ icon: 'none'
+ })
+ }
+ )
}
}
}
diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue
index 6f8efe71..5710df75 100644
--- a/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/pages/purchaseReceipt/job/receiptDetail.vue
@@ -5,7 +5,7 @@
+ @remove="updateData" @updateData="updateData" :locationTypeList='locationTypeList'>
@@ -35,7 +35,6 @@