Explorar el Código

禅道bug 修复:销售订单模板下载功能

yusheng hace 9 meses
padre
commit
700364b3ac

+ 2 - 2
src/api/aps/presalesorder.js

@@ -67,8 +67,8 @@ export async function exportFile(params) {
 }
 
 //下载模板
-export async function importTemplate(name) {
-  const res = await request.post('/aps/presalesorder/importTemplate', {}, {
+export async function importTemplate(url,name) {
+  const res = await request.post(url||'/aps/presalesorder/importTemplate', {}, {
     responseType: 'blob'
   });
   download(res.data, name||`交期预估下载模板.xlsx`)

+ 1 - 1
src/views/saleOrder/components/order-search.vue

@@ -400,7 +400,7 @@
             >
               <el-button type="warning" size="mini">批量导入</el-button>
             </el-upload>
-            <el-button type="info" size="mini" @click="importTemplate('销售订单模板.xlsx')" v-if="$hasPermission('aps:salesorder:download')"> 下载模板 </el-button>
+            <el-button type="info" size="mini" @click="importTemplate('/aps/salesorder/importTemplate','销售订单模板.xlsx')" v-if="$hasPermission('aps:salesorder:download')"> 下载模板 </el-button>
             <el-button
               type="danger"
               size="mini"

+ 26 - 13
src/views/saleOrder/index.vue

@@ -231,19 +231,32 @@
             align: 'center',
             showOverflowTooltip: true
           },
-          // {
-          //   prop: 'bomCategoryName',
-          //   label: 'BOM版本',
-          //   align: 'center',
-          //   width: 130,
-          //   showOverflowTooltip: true,
-          //   formatter: (row) => {
-          //     if (row.bomCategoryName) {
-          //       return `${row.bomCategoryName} (V${row.bomCategoryVersions}.0)`;
-          //     }
-          //     return '';
-          //   }
-          // },
+          {
+            prop: 'bomType',
+            label: 'BOM类型',
+            align: 'center',
+            width: 130,
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              if (row.bomType) {
+                return row.bomType == 1 ? 'PBOM' : row.bomType == 2 ? 'MBOM' :  row.bomType == 3 ? 'ABOM' : 'EBOM';
+              }
+              return '';
+            }
+          },
+          {
+            prop: 'versions',
+            label: 'BOM版本',
+            align: 'center',
+            width: 130,
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              if (row.versions) {
+                return `V${row.versions}.0`;
+              }
+              return '';
+            }
+          },
           {
             prop: 'productName',
             label: '名称',