From 59d56975db205d1122af494dbbb9cd0589f35798 Mon Sep 17 00:00:00 2001
From: zhouhaibin <zhouhaibin@qq.com>
Date: Tue, 11 Jun 2024 09:45:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/costManagement/api/index.ts       | 36 +++++++-------
 .../costManagement/view/costTable/index.vue   | 11 +++++
 .../view/companyProducts/index.vue            | 34 +++++++++++++
 .../view/personProducts/index.vue             | 34 +++++++++++++
 .../view/supplierProducts/index.vue           | 48 +++++--------------
 5 files changed, 109 insertions(+), 54 deletions(-)

diff --git a/src/modules/costManagement/api/index.ts b/src/modules/costManagement/api/index.ts
index 047fb8d..bae0ef1 100644
--- a/src/modules/costManagement/api/index.ts
+++ b/src/modules/costManagement/api/index.ts
@@ -20,39 +20,39 @@ const moduleName = 'costManagement'
 //   }
 // }
 
-
-
 // 造价表
 export const costTable = Object.assign({}, COMMON_METHOD, {
   serveUrl: '/' + moduleName + '/' + 'costTable' + '/',
-    // 新增
-    addCostTable(itemList) {
-      return request.post({ url: this.serveUrl + 'addCostTable', data: itemList })
-    },
-   // 查询数据
-   getCostTableDetail(id) {
+  // 新增
+  addCostTable(itemList) {
+    return request.post({ url: this.serveUrl + 'addCostTable', data: itemList })
+  },
+  // 查询数据
+  getCostTableDetail(id) {
     return request.get({ url: this.serveUrl + 'getCostTableDetail/' + id })
   },
-  modifyCostTable(params){
+  modifyCostTable(params) {
     return request.put({ url: this.serveUrl + 'modifyCostTable', data: params })
-
+  },
+  // 导出数据
+  exportData(id) {
+    return request.download({ url: this.serveUrl + 'exportData/'+id })
   }
 })
 
 // 造价明细
 export const costItemDetail = Object.assign({}, COMMON_METHOD, {
   serveUrl: '/' + moduleName + '/' + 'costItemDetail' + '/',
-    // 全产品造价
-    getProductsPageByType(params) {
-      return request.get({ url: this.serveUrl + 'getProductsPageByType', params })
-    },
-   // 查询数据
-   getCostTableDetail(id) {
+  // 全产品造价
+  getProductsPageByType(params) {
+    return request.get({ url: this.serveUrl + 'getProductsPageByType', params })
+  },
+  // 查询数据
+  getCostTableDetail(id) {
     return request.get({ url: this.serveUrl + 'getCostTableDetail/' + id })
   },
-  modifyCostTable(params){
+  modifyCostTable(params) {
     return request.put({ url: this.serveUrl + 'modifyCostTable', data: params })
-
   }
 })
 // 字典类型
diff --git a/src/modules/costManagement/view/costTable/index.vue b/src/modules/costManagement/view/costTable/index.vue
index b0945ec..f7584f4 100644
--- a/src/modules/costManagement/view/costTable/index.vue
+++ b/src/modules/costManagement/view/costTable/index.vue
@@ -44,6 +44,14 @@
           >
         </template>
       </el-popconfirm>
+      <el-button
+        type="primary"
+        text
+        icon="el-icon-download"
+        @click="exportData(row)"
+        v-permission="pageCode + 'remove'"
+        >导出</el-button
+      >
     </template>
   </avue-crud>
   <AddPage ref="addPage" @refresh="onLoad" />
@@ -185,6 +193,9 @@ function searchChange(val, done) {
   onLoad()
   done()
 }
+function exportData(row) {
+  api.exportData(row.id)
+}
 </script>
 <style>
 .el-input,
diff --git a/src/modules/productManagement/view/companyProducts/index.vue b/src/modules/productManagement/view/companyProducts/index.vue
index 02fde0b..fefb932 100644
--- a/src/modules/productManagement/view/companyProducts/index.vue
+++ b/src/modules/productManagement/view/companyProducts/index.vue
@@ -105,6 +105,10 @@ option.value = {
       labelWidth: 120,
       prop: 'productName', //sProductName
       search: true,
+      html:true,
+      formatter:(val)=>{
+        return val.productName
+      },
       searchLabelWidth: 120
     },
     {
@@ -144,8 +148,38 @@ option.value = {
       labelWidth: 120,
       prop: 'productSpecifications',
       //editDisabled: true //编辑时禁用
+      html:true,
+      formatter:(val)=>{
+        return val.productSpecifications
+      },
       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,
diff --git a/src/modules/productManagement/view/personProducts/index.vue b/src/modules/productManagement/view/personProducts/index.vue
index 5662027..8ef5e60 100644
--- a/src/modules/productManagement/view/personProducts/index.vue
+++ b/src/modules/productManagement/view/personProducts/index.vue
@@ -105,6 +105,10 @@ option.value = {
       labelWidth: 120,
       prop: 'productName', //sProductName
       search: true,
+      html:true,
+      formatter:(val)=>{
+        return val.productName
+      },
       searchLabelWidth: 120
     },
     {
@@ -144,8 +148,38 @@ option.value = {
       labelWidth: 120,
       prop: 'productSpecifications',
       //editDisabled: true //编辑时禁用
+      html:true,
+      formatter:(val)=>{
+        return val.productSpecifications
+      },
       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,
diff --git a/src/modules/productManagement/view/supplierProducts/index.vue b/src/modules/productManagement/view/supplierProducts/index.vue
index ee0ea05..906bb8b 100644
--- a/src/modules/productManagement/view/supplierProducts/index.vue
+++ b/src/modules/productManagement/view/supplierProducts/index.vue
@@ -57,7 +57,7 @@
     <template #modelId-form="{}">
       <product-model-components v-model="formData.modelId" :module-param="moduleParam" />
     </template>
-  </avue-crud>
+  </avue-crud>  
 </template>
 <script setup>
 import { ref, getCurrentInstance, reactive } from 'vue'
@@ -107,7 +107,11 @@ option.value = {
       labelWidth: 120,
       prop: 'productName', //sProductName
       search: true,
-      overHidden: true,
+      // overHidden: true,
+      html:true,
+      formatter:(val)=>{
+        return val.productName
+      },
       searchLabelWidth: 120
     },
     {
@@ -146,8 +150,13 @@ option.value = {
       label: '产品规格',
       labelWidth: 120,
       prop: 'productSpecifications',
+      search: true,
       //editDisabled: true //编辑时禁用
-      overHidden: true,
+      // overHidden: true,
+      html:true,
+      formatter:(val)=>{
+        return val.productSpecifications
+      },
       display: false //表单不展示该字段
     },
     {
@@ -178,39 +187,6 @@ option.value = {
     },
 
 
-    // {
-    //   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: '信息来源',