暂存

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -1380,7 +1380,7 @@ export default {
     costrefreshEdit(e) {
       let item = JSON.parse(JSON.stringify(e));
       console.log(item);
-      const { index, id, cost_fee, delivery_fee, min_num, spec_value_value } =
+      const { index, id, cost_fee, delivery_fee, min_num, nake_fee } =
         item;
       if (index + "" === "-1") {
         this.ladder_tableData.push(item);
@@ -1391,7 +1391,7 @@ export default {
             this.ladder_tableData[findex].cost_fee = cost_fee;
             this.ladder_tableData[findex].delivery_fee = delivery_fee;
             this.ladder_tableData[findex].min_num = min_num;
-            this.ladder_tableData[findex].spec_value_value = spec_value_value;
+            this.ladder_tableData[findex].nake_fee = nake_fee;
           }
         });
       }

src/views/goodStore/goodsCost/components/costFormAddEdit.vue

@@ -164,16 +164,17 @@ export default {
   methods: {
     async initForm() {
       this.loading = true;
-      await this.resetFormData();
-      this.rulesThis = this.rules;
+      // await this.resetFormData();
+
       console.log(this.index);
       if (this.index + "" === "-1") {
         this.title = "添加成本阶梯";
       } else {
         this.title = "修改成本阶梯";
       }
-
+      this.rulesThis = this.rules;
       await this.resetForm();
+
       this.loading = false;
     },
     async resetForm() {
@@ -187,15 +188,26 @@ export default {
       });
     },
     async resetFormData() {
-      const { id, min_num, cost_fee, nake_fee, delivery_fee } = this.sitem;
-      this.ruleForm = {
-        id: id || "",
-        index: this.index,
-        min_num: min_num || "0",
-        cost_fee: cost_fee || "0",
-        nake_fee: nake_fee || "0",
-        delivery_fee: delivery_fee || "0",
-      };
+      if (this.index + "" === "-1") {
+        this.ruleForm = {
+          id: "",
+          index: "-1",
+          min_num: "0",
+          cost_fee: "0",
+          nake_fee: "0",
+          delivery_fee: "0",
+        };
+      } else {
+        const { id, min_num, cost_fee, nake_fee, delivery_fee } = this.sitem;
+        this.ruleForm = {
+          id: id || "",
+          index: this.index,
+          min_num: min_num || "0",
+          cost_fee: cost_fee || "0",
+          nake_fee: nake_fee || "0",
+          delivery_fee: delivery_fee || "0",
+        };
+      }
     },
 
     number_change(e, key) {

src/views/goodStore/goodsOnline/ShowDataTableColumns.js

@@ -137,22 +137,23 @@ export default [
   {
     prop: "delivery_place_cn",
     label: "发货地",
-    span: 8,
+    span: 10,
   },
   {
     prop: "origin_place_cn",
     label: "产地",
-    span: 8,
+    span: 10,
   },
+
   {
-    prop: "is_stock",
-    label: "是否库存品",
-    _slot_: "is_stock",
+    prop: "unit",
+    label: "单位",
     span: 4,
   },
   {
-    prop: "unit",
-    label: "单位",
+    prop: "is_stock",
+    label: "是否库存品",
+    _slot_: "is_stock",
     span: 4,
   },
   {
@@ -161,12 +162,7 @@ export default [
     append: '%',
     span: 4,
   },
-  {
-    prop: "good_type",
-    label: "是否定制",
-    _slot_: "good_type",
-    span: 4,
-  },
+
   {
     prop: "delivery_day",
     label: "物流时间",
@@ -253,14 +249,19 @@ export default [
   {
     prop: "updatetime",
     label: "更新时间",
-    span: 8,
+    span: 6,
   },
   {
     prop: "addtime",
     label: "创建时间",
-    span: 8,
+    span: 6,
+  },
+  {
+    prop: "good_type",
+    label: "是否定制",
+    _slot_: "good_type",
+    span: 6
   },
-
 
   {
     prop: "after_sales",

src/views/goodStore/goodsOnline/detail.vue

@@ -79,8 +79,8 @@
                       ).name || '--'
                     "
                   />
-                  <span v-if="sitem.good_type === '1'"
-                    >起订量:{{ sitem.moq }}，工期：{{
+                  <span v-if="sitem.good_type === '1'" style="padding:0 0 0 5px"
+                    >{{ sitem.moq }}起订/工期{{
                       sitem.customized
                     }}天</span
                   >

src/views/goodStore/goodsOnline/index.vue

@@ -264,7 +264,7 @@ export default {
       loading: false,
       parmValue: {
         good_name: "", //商品名称
-        spucodecode: "", //商品编号
+        spucode: "", //商品编号
         cat_id: "", //商品分类
         start: "", //开始日期
         end: "", //结束日期
@@ -320,7 +320,7 @@ export default {
       };
       this.parmValue = {
         good_name: "", //商品名称
-        spucodecode: "", //商品编号
+        spucode: "", //商品编号
         cat_id: "", //商品分类
         start: "", //开始日期
         end: "", //结束日期
@@ -432,14 +432,14 @@ export default {
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
       model.good_name = this.select === "1" ? this.sinput : ""; //商品名称
-      model.spucodecode = this.select === "1" ? this.sinput : ""; //商品编号
-      model.platform_code = this.select === "1" ? this.sinput : ""; //平台编码
-      model.supplierNo = this.select === "1" ? this.sinput : ""; //供应商编号
-      model.companyNo = this.select === "1" ? this.sinput : ""; //业务企业编号
-      model.exam_status = this.select === "1" ? this.sinput : ""; //审核状态
-      model.plat_code = this.select === "1" ? this.sinput : ""; //平台商品编号
-      model.creater = this.select === "1" ? this.sinput : ""; //
-      const res = await asyncRequest.list(this.parmValue);
+      model.spucode = this.select === "2" ? this.sinput : ""; //商品编号
+      // model.platform_code = this.select === "1" ? this.sinput : ""; //平台编码
+      // model.supplierNo = this.select === "1" ? this.sinput : ""; //供应商编号
+      model.companyNo = this.select === "5" ? this.sinput : ""; //业务企业编号
+      // model.exam_status = this.select === "1" ? this.sinput : ""; //审核状态
+      model.plat_code = this.select === "6" ? this.sinput : ""; //平台商品编号
+      model.creater = this.select === "7" ? this.sinput : ""; //
+      const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.tableData.forEach((a) => {

src/views/sellOut/zixunOrder/components/feedbackList.vue

@@ -410,8 +410,11 @@ export default {
         });
     },
     buy_goods(row) {
-      const {}=this.sitem
+      const {company,khname,platform_name}=this.sitem
       this.bayGoodItem = JSON.parse(JSON.stringify(row));
+      this.bayGoodItem.in_company=company
+      this.bayGoodItem.in_khname=khname
+      this.bayGoodItem.in_platform_name=platform_name
       this.bayGoodShowModel=true;
       // console.log(row);
     },