diff --git a/java-mall-app-shop-admin/pages/order/components/OrderItem.vue b/java-mall-app-shop-admin/pages/order/components/OrderItem.vue
index 30bd201..e23d7f7 100644
--- a/java-mall-app-shop-admin/pages/order/components/OrderItem.vue
+++ b/java-mall-app-shop-admin/pages/order/components/OrderItem.vue
@@ -16,6 +16,7 @@
}}前送达
-
+
@@ -549,6 +555,9 @@ export default {
showOrderPickingPopup: false,
currOrderItem: {
order_items: [],
+ sf_order_info: {
+ feed: null,
+ },
},
isRefreshing: false,
refreshInterval: null, // 全局定时器
@@ -574,6 +583,13 @@ export default {
},
created() {
this.currOrderItem = JSON.parse(JSON.stringify(this.orderItem));
+ if (this.currOrderItem.sf_order_info.feed) {
+ this.currOrderItem.sf_order_info.feed = JSON.parse(
+ this.currOrderItem.sf_order_info.feed
+ );
+
+ console.log("有值feed：", this.currOrderItem.sf_order_info);
+ }
},
mounted() {
// 每1秒刷新一次数据（触发界面更新）
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue b/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue
index 35c7623..280d3bd 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue
@@ -19,7 +19,9 @@
@click="pageBack()"
>
- 删除
+
+ 删除
+
@@ -364,6 +366,39 @@
+
{
+ this.productSpec.forEach((specGroup) => {
if (specGroup.item && Array.isArray(specGroup.item)) {
specGroup.item.forEach((item) => {
specItemMap.push(item.id);
@@ -797,7 +849,7 @@ export default {
return;
}
- this.showRightPopup = true;
+ this.showRightPecificationOfGoodPopup = true;
},
treeConfirm(list) {
if (list.length > 1) {
@@ -819,9 +871,9 @@ export default {
treeCancel() {
this.$refs.tkitree._hide();
},
- handerSpecificationInfoList(specificationInfoList) {
+ handerSpecificationInfoList(specificationInfoList, cheboxList) {
this.specificationInfoList = specificationInfoList;
-
+ this.cheboxList = cheboxList;
console.log(this.specificationInfoList);
},
handerAddAndEditPopup() {
@@ -838,7 +890,7 @@ export default {
if (this.specificationInfoList.length <= 0) {
this.$refs.uToast.show({
- message: "请选择选择规格",
+ message: "请选择填写售卖规格信息",
type: "error",
duration: 1000,
});
@@ -851,7 +903,7 @@ export default {
const key2 = String(item.spec_id) + "_" + String(item.spec_item_id);
const color_img = this.viceImg.map((item) => item.url);
const mainMColorimg = this.primaryImg.map((item) => item.url);
- let obj = {
+ var obj = {
color_img: color_img,
item_is_default: item.item_is_default,
item_market_price:
@@ -861,22 +913,23 @@ export default {
item_unit_points: "0", //积分
item_unit_price: item.item_unit_price_2 || item.item_unit_price,
main_color_img: mainMColorimg.toString(),
- product_spec:
- item.spec_item_id > 0
- ? JSON.stringify([
- {
- id: item.spec_id,
- name: this.commoditSpecificationBaseInfo.specs[0]
- .spec_name,
- item: {
- id: item.spec_item_id,
- name: item.spec_item_name,
- },
- },
- ])
- : "[]",
};
+ if (this.cheboxList.length > 0 || this.productSpec.length > 0) {
+ obj.product_spec = JSON.stringify([
+ {
+ id: item.spec_id,
+ name: this.commoditSpecificationBaseInfo.specs[0].spec_name,
+ item: {
+ id: item.spec_item_id,
+ name: item.spec_item_name,
+ },
+ },
+ ]);
+ } else {
+ obj.product_spec = "[]";
+ }
+
if (this.isAdd) {
obj.category_id = this.form.category_id;
obj.siid = String(item.spec_item_id || "");
@@ -911,28 +964,33 @@ export default {
return obj;
});
- const productSpec = this.specificationInfoList.reduce((acc, item) => {
- const existingSpec = acc.find((spec) => spec.id === item.spec_id);
+ var productSpec = this.productSpec;
- if (existingSpec) {
- existingSpec.item.push({
- id: item.spec_item_id,
- name: item.spec_item_name,
- });
- } else {
- acc.push({
- id: item.spec_id,
- item: [
- {
- id: item.spec_item_id,
- name: item.spec_item_name,
- },
- ],
- });
- }
+ if (this.cheboxList.length > 0 || productSpec.length > 0) {
+ productSpec = this.specificationInfoList.reduce((acc, item) => {
+ const existingSpec = acc.find((spec) => spec.id === item.spec_id);
- return acc;
- }, []);
+ if (existingSpec) {
+ existingSpec.item.push({
+ id: item.spec_item_id,
+ name: item.spec_item_name,
+ });
+ } else {
+ acc.push({
+ id: item.spec_id,
+ name: this.commoditSpecificationBaseInfo.specs[0].spec_name,
+ item: [
+ {
+ id: item.spec_item_id,
+ name: item.spec_item_name,
+ },
+ ],
+ });
+ }
+
+ return acc;
+ }, []);
+ }
console.log(this.form.product_param);
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue b/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue
index 7c74893..96d3ae0 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue
@@ -34,7 +34,7 @@
scroll-with-animation
class="tab-view"
:scroll-into-view="scrollViewId"
- :style="{ top: top + 'px' }"
+ :style="{ top: top + 'px' }"
>
@@ -131,8 +131,8 @@
@change="handleSelectAll($event, false)"
>
@@ -158,7 +158,7 @@
- 上架
+
+ 上架
- 下架
+
+ 下架
- 删除
+
+ 删除
- 共选择 {{ selectCommodityList.length }}/100
+ 共选择
+ {{ selectCommodityList.length }}
+ /100
查看
@@ -376,54 +382,53 @@
}"
>
-
-
-
-
-
-
-
-
- {{ item.product_name }}
-
-
- 库存{{ item.itemQuantity }}
-
-
- ¥
- {{ item.product_unit_price }}
-
-
-
-
+
+
+
+
+
+
+ {{ item.product_name }}
+
+
+ 库存{{ item.itemQuantity }}
+
+
+ ¥
+ {{ item.product_unit_price }}
+
+
+
+
+
+
-
@@ -896,7 +901,7 @@ export default {
return item;
});
- await this.updateCommodityStatistics();
+ await this.getProductList();
this.clearCheckboxLists(this.tabbar);
this.selectCommodityList = [];
@@ -1367,7 +1372,7 @@ export default {