From 38b5988fc107d74b4f3183734daa41dd08239b1a Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 30 八月 2023 17:56:03 +0800
Subject: [PATCH] 供应商附件删除和创建时间及产品供货时长等字段联调

---
 src/views/supplierManage/supplier/index.vue         |    3 +--
 src/views/supplierManage/supplier/AddNewProduct.vue |   25 +++++++++++++++++++------
 src/views/supplierManage/supplier/AddSupplier.vue   |   17 ++++++++---------
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/views/supplierManage/supplier/AddNewProduct.vue b/src/views/supplierManage/supplier/AddNewProduct.vue
index 9a04616..0478e65 100644
--- a/src/views/supplierManage/supplier/AddNewProduct.vue
+++ b/src/views/supplierManage/supplier/AddNewProduct.vue
@@ -60,7 +60,10 @@
       productId: 1,
       isNoProduct: true,
       supplierId: this.addCommonConfig.infomation.supplierId,
-      detailEnter: true
+      detailEnter: true,
+      deliveryTime: this.addCommonConfig.infomation.deliveryTime, // 渚涜揣鏃堕暱
+      shippingDuration: this.addCommonConfig.infomation.shippingDuration, // 鐗╂祦鏃堕暱
+      purchasePrice: this.addCommonConfig.infomation.purchasePrice // 閲囪喘浠锋牸
     }
   },
   created() {
@@ -114,7 +117,7 @@
     saveParams() {
       let data = this.editConfig.infomation
       let params = {
-        deliveryTime: data.deliveryTime || 0,
+        deliveryTime: this.deliveryTime || 0,
         id: data.ID || 0,
         maximumStock: data.maximumStock || 0,
         minimumStock: data.minimumStock || 0,
@@ -122,9 +125,9 @@
         name: data.name || "",
         number: data.number || "",
         productType: data.productType || "",
-        purchasePrice: data.purchasePrice || 0,
+        purchasePrice: this.purchasePrice || 0,
         remark: data.remark || "",
-        shippingDuration: data.shippingDuration || 0,
+        shippingDuration: this.shippingDuration || 0,
         specifications: data.specifications || "",
         supplierId: this.supplierId || 0,
         unit: data.unit || ""
@@ -167,10 +170,16 @@
     // 浜у搧鍒楄〃杈撳叆
     inputContent(val, prop, row) {
       this.productId = row.productId
+      this.deliveryTime = row.deliveryTime
+      this.shippingDuration = row.shippingDuration
+      this.purchasePrice = row.purchasePrice
       this.tableData.map((item) => {
         if (item.productId === row.productId) {
           item[prop] = val
           item.supplierId = this.supplierId
+          item.deliveryTime = this.deliveryTime
+          item.shippingDuration = this.shippingDuration
+          item.purchasePrice = this.purchasePrice
         }
       })
     },
@@ -184,8 +193,10 @@
         desc: "",
         name: "",
         number: "",
-        price: 0,
+        purchasePrice: 0,
         total: 0,
+        deliveryTime: 0,
+        shippingDuration: 0,
         supplierId: this.supplierId
       })
     },
@@ -200,8 +211,10 @@
           desc: "",
           name: "",
           number: "",
-          price: 0,
+          purchasePrice: 0,
           total: 0,
+          deliveryTime: 0,
+          shippingDuration: 0,
           supplierId: this.supplierId
         }
       ]
diff --git a/src/views/supplierManage/supplier/AddSupplier.vue b/src/views/supplierManage/supplier/AddSupplier.vue
index 4e35814..93e1654 100644
--- a/src/views/supplierManage/supplier/AddSupplier.vue
+++ b/src/views/supplierManage/supplier/AddSupplier.vue
@@ -210,8 +210,7 @@
   createContract,
   updateSupplier,
   getIndustryList,
-  getSupplierTypeList,
-  deleteContract
+  getSupplierTypeList
   // previewContract
 } from "@/api/supplierManage/supplier"
 import EditDropdownDialog from "@/views/other/commonDialog/EditDropdownDialog"
@@ -424,13 +423,13 @@
     },
     // 鍒犻櫎鍚堝悓
     delContractClick() {
-      deleteContract({
-        id: this.file_id
-      }).then((res) => {
-        console.log(res)
-        this.$message.success(res.msg)
-        this.file_id = 0
-      })
+      // deleteContract({
+      //   id: this.file_id
+      // }).then((res) => {
+      //   console.log(res)
+      //   this.$message.success(res.msg)
+      this.file_id = 0
+      // })
     },
     // 棰勮鍚堝悓
     async previewClick() {
diff --git a/src/views/supplierManage/supplier/index.vue b/src/views/supplierManage/supplier/index.vue
index 77a5721..2562d39 100644
--- a/src/views/supplierManage/supplier/index.vue
+++ b/src/views/supplierManage/supplier/index.vue
@@ -178,7 +178,7 @@
           { label: "鑱旂郴浜�", prop: "contact", min: 130 },
           { label: "鑱旂郴鐢佃瘽", prop: "phone", min: 130 },
           { label: "鐘舵��", prop: "status_name", min: 130 },
-          { label: "鍒涘缓鏃堕棿", prop: "member_name", min: 130 }
+          { label: "鍒涘缓鏃堕棿", prop: "created_at", min: 130 }
         ]
       }
       this.searchOptions = []
@@ -330,7 +330,6 @@
         type: "warning"
       })
         .then(() => {
-          console.log("dddd")
           deleteProduct({ id: row.ID }).then((response) => {
             if (response.code === 200) {
               this.$message.success("鍒犻櫎鎴愬姛")

--
Gitblit v1.8.0