Jelajahi Sumber

修改导出bug,添加下载按钮

shiyi 6 tahun lalu
induk
melakukan
a6a4aaae53

+ 4 - 0
src/dashoo.cn/backend/api/business/oilsupplier/supplierdataentry/supplierdataentry.go

@@ -114,4 +114,8 @@ type SupplierWinningDataEntryView struct {
 	//WinningList []SupplierWinningDataEntry
 	SupplierWinningDataEntry   `xorm:"extends"`
 	WinningTimeStr      string `xorm:"-"`
+}
+
+type SupplierCertSubEntry struct {
+	Name                string `xorm:"VARCHAR(50)"`
 }

+ 10 - 7
src/dashoo.cn/backend/api/controllers/oilsupplier/supplierdataentry.go

@@ -1,7 +1,6 @@
 package oilsupplier
 
 import (
-	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	"dashoo.cn/backend/api/business/oilsupplier/supplierdataentry"
 	"dashoo.cn/backend/api/business/workflow"
 	. "dashoo.cn/backend/api/controllers"
@@ -59,7 +58,7 @@ func (this *SupplierDataEntryController) DocExport() {
 	var tabledata4 []supplierdataentry.SupplierThreeYearsDataEntryView
 	var tabledata5 []supplierdataentry.SupplierPatentDataEntryView
 	var tabledata6 []supplierdataentry.SupplierWinningDataEntryView
-	var tabledata7 []suppliercertsub.OilSupplierCertSub
+	var tabledata7 []supplierdataentry.SupplierCertSubEntry
 
 	SupplierCertId := strconv.Itoa(model2.Id)
 	where3 := "SupplierCertId = '" + SupplierCertId + "'"
@@ -141,12 +140,16 @@ func (this *SupplierDataEntryController) DocExport() {
 	datamap["DesignerTotal"] = model2.DesignerTotal
 	datamap["SkillerTotal"] = model2.SkillerTotal
 
-	var Name string
-	Name = tabledata7[0].Name
-	for i := 1; i < len(tabledata7); i++ {
-		Name = Name + "," + tabledata7[i].Name
+	if len(tabledata7) != 0 {
+		var Name string
+		Name = tabledata7[0].Name
+		for i := 1; i < len(tabledata7); i++ {
+			Name = Name + "," + tabledata7[i].Name
+		}
+		datamap["Name"] = Name
+	} else {
+		datamap["Name"] = ""
 	}
-	datamap["Name"] = Name
 
 	var interfaceSlice3 = make([]interface{}, len(tabledata3))
 	datamap["MajorEquipments"] = workflow.TableDetailData{

+ 5 - 5
src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -70,8 +70,12 @@
         height="calc(100vh - 243px)"
         style="width: 100%"
         @sort-change="orderby"
-        @row-click="handle"
       >
+        <el-table-column label="操作" min-width="200px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" @click="toWord(scope.row)" title="下载" size="mini" icon="el-icon-download" width="120px">下载</el-button>
+          </template>
+        </el-table-column>
         <!--内框表格剩余栏显示-->
         <el-table-column label="准入证号" prop="AccessCardNo" sortable align="center"></el-table-column>
         <el-table-column label="企业名称" prop="SupplierName" sortable align="center"></el-table-column>
@@ -870,14 +874,10 @@ export default {
       }
       return wbout
     },
-    handle (row, column, event, cell) {
-      this.toWord(row)
-    },
     //导出到Word文件
     toWord (val) {
       dataapi.docexport(val.Id, this.$axios)
         .then(res => {
-          console.log(res)
           // response
           if (res.data.code === 0) {
             this.$message({