From 8922464fe5d5fcafd103355bd00a8979daa94f53 Mon Sep 17 00:00:00 2001
From: zhouhaibin <zhouhaibin@qq.com>
Date: Wed, 5 Jun 2024 12:53:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=A0=E4=BB=B7=E7=AE=A1=E7=90=86=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/costTypeComponents.vue         |  2 +-
 .../costManagement/view/costTable/add.vue     |  2 +-
 .../costManagement/view/costTable/modify.vue  |  2 +-
 .../view/companyProducts/index.vue            |  4 +-
 .../view/personProducts/index.vue             |  4 +-
 .../view/supplierProducts/index.vue           | 68 ++++++++++++++++++-
 6 files changed, 73 insertions(+), 9 deletions(-)

diff --git a/src/modules/costManagement/components/costTypeComponents.vue b/src/modules/costManagement/components/costTypeComponents.vue
index 6da9edb..5fc29aa 100644
--- a/src/modules/costManagement/components/costTypeComponents.vue
+++ b/src/modules/costManagement/components/costTypeComponents.vue
@@ -139,7 +139,7 @@ export default {
             precision: 2,
             mim: 0
           },
-          modelDescription: {
+          productSpecifications: {
             label: '产品描述',
             labelWidth: 120,
             //editDisabled: true //编辑时禁用
diff --git a/src/modules/costManagement/view/costTable/add.vue b/src/modules/costManagement/view/costTable/add.vue
index 4742e82..3ef901f 100644
--- a/src/modules/costManagement/view/costTable/add.vue
+++ b/src/modules/costManagement/view/costTable/add.vue
@@ -306,7 +306,7 @@ export default {
       })
     },
     updateCostInfo(val){
-      this.curdForm.costDescribe = val.modelDescription
+      this.curdForm.costDescribe = val.productSpecifications
       this.curdForm.unitPrice=val.productPrice
     }
   },
diff --git a/src/modules/costManagement/view/costTable/modify.vue b/src/modules/costManagement/view/costTable/modify.vue
index d4636ee..2bf58ce 100644
--- a/src/modules/costManagement/view/costTable/modify.vue
+++ b/src/modules/costManagement/view/costTable/modify.vue
@@ -310,7 +310,7 @@ export default {
       })
     },
     updateCostInfo(val){
-      this.curdForm.costDescribe = val.modelDescription
+      this.curdForm.costDescribe = val.productSpecifications
       this.curdForm.unitPrice=val.productPrice
     },
     close() {
diff --git a/src/modules/productManagement/view/companyProducts/index.vue b/src/modules/productManagement/view/companyProducts/index.vue
index 9e1821b..02fde0b 100644
--- a/src/modules/productManagement/view/companyProducts/index.vue
+++ b/src/modules/productManagement/view/companyProducts/index.vue
@@ -140,9 +140,9 @@ option.value = {
       minRows: 4 //文本最小行数
     },
     {
-      label: '产品描述',
+      label: '产品规格',
       labelWidth: 120,
-      prop: 'modelDescription',
+      prop: 'productSpecifications',
       //editDisabled: true //编辑时禁用
       display: false //表单不展示该字段
     },
diff --git a/src/modules/productManagement/view/personProducts/index.vue b/src/modules/productManagement/view/personProducts/index.vue
index 874408f..5662027 100644
--- a/src/modules/productManagement/view/personProducts/index.vue
+++ b/src/modules/productManagement/view/personProducts/index.vue
@@ -140,9 +140,9 @@ option.value = {
       minRows: 4 //文本最小行数
     },
     {
-      label: '产品描述',
+      label: '产品规格',
       labelWidth: 120,
-      prop: 'modelDescription',
+      prop: 'productSpecifications',
       //editDisabled: true //编辑时禁用
       display: false //表单不展示该字段
     },
diff --git a/src/modules/productManagement/view/supplierProducts/index.vue b/src/modules/productManagement/view/supplierProducts/index.vue
index 6453d2e..ee0ea05 100644
--- a/src/modules/productManagement/view/supplierProducts/index.vue
+++ b/src/modules/productManagement/view/supplierProducts/index.vue
@@ -107,6 +107,7 @@ option.value = {
       labelWidth: 120,
       prop: 'productName', //sProductName
       search: true,
+      overHidden: true,
       searchLabelWidth: 120
     },
     {
@@ -142,12 +143,75 @@ option.value = {
       minRows: 4 //文本最小行数
     },
     {
-      label: '产品描述',
+      label: '产品规格',
       labelWidth: 120,
-      prop: 'modelDescription',
+      prop: 'productSpecifications',
       //editDisabled: true //编辑时禁用
+      overHidden: true,
       display: false //表单不展示该字段
     },
+    {
+      label: '图片',
+      labelWidth: 120,
+      prop: 'image',
+      type: 'img',
+    },
+    {
+      label: '品牌',
+      labelWidth: 120,
+      prop: 'brand',
+    },
+    {
+      label: '单位',
+      labelWidth: 120,
+      prop: 'unit',
+    },
+    {
+      label: '除税价格',
+      labelWidth: 120,
+      prop: 'exTaxPrice',
+    },
+    {
+      label: '税率',
+      labelWidth: 120,
+      prop: 'taxrate',
+    },
+
+
+    // {
+    //   label: '图片',
+    //   labelWidth: 120,
+    //   prop: 'image',
+    //   hide: true
+    // },
+    // {
+    //   label: '品牌',
+    //   labelWidth: 120,
+    //   prop: 'brand',
+    //   hide: true
+    // },
+    // {
+    //   label: '单位',
+    //   labelWidth: 120,
+    //   prop: 'unit',
+    //   hide: true
+    // },
+    // {
+    //   label: '除税价格',
+    //   labelWidth: 120,
+    //   prop: 'exTaxPrice',
+    //   hide: true
+    // },
+    // {
+    //   label: '税率',
+    //   labelWidth: 120,
+    //   prop: 'taxrate',
+    //   hide: true
+    // },
+
+
+
+
     {
       label: '信息来源',
       labelWidth: 120,