企业资质

src/dashoo.cn/backend/api/controllers/oilsupplier/select.go

@@ -643,6 +643,7 @@ func (this *SelectController) FileList() {
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
     subfilename := this.GetString("subfileName")
+	supplierId := this.GetString("SupplierId")
 
 
 	if Order != "" && Prop != "" {
@@ -661,7 +662,12 @@ func (this *SelectController) FileList() {
 	sql1:= " CreateUserId = '" + this.User.Id + "' or CommercialNo='"+registerUser.CommercialNo+"'"
 	svc.GetEntity(&company,sql1)
 
-	where = where + " and SupplierId=" + strconv.Itoa(company.Id)
+	if supplierId != "0" {
+		where = where + " and SupplierId=" + supplierId
+	} else {
+		where = where + " and SupplierId=" + strconv.Itoa(company.Id)
+	}
+
 
 	if subfilename != "" {
 		where = where + " and NeedFileType like '%" + subfilename + "%'"

src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -71,11 +71,12 @@
         style="width: 100%"
         @sort-change="orderby"
       >
-        <el-table-column label="操作" width="200px" align="center" fixed="right" show-overflow-tooltip>
+        <el-table-column label="操作" width="260px" align="center" fixed="right" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click="toWord(scope.row)" title="下载" size="mini" icon="el-icon-download" width="120px">表单下载</el-button>
             <!--<el-button type="text" @click="toPdf(scope.row)" title="导出" size="mini" icon="el-icon-document" width="120px">准入范围</el-button>-->
             <el-button type="text" @click="opencertsub(scope.row)" title="导出" size="mini" icon="el-icon-document" width="120px">准入范围</el-button>
+            <el-button type="text" @click="openfilelist(scope.row)" title="导出" size="mini" icon="el-icon-document" width="120px">企业资质</el-button>
           </template>
         </el-table-column>
         <!--内框表格剩余栏显示-->
@@ -719,6 +720,13 @@
             ></el-pagination>
           </el-card>
     </el-dialog>
+    <el-dialog :visible.sync="dialogVisibleSubFile" width="80%">
+      <subfile-list ref="subfileListRef"
+                        :SupplierId="SupplierId"
+                        height="360px"
+                        style="margin-top: 20px"></subfile-list>
+
+    </el-dialog>
   </div>
 </template>
 
@@ -732,8 +740,12 @@ import FileSaver from 'file-saver'
 import XLSX from 'xlsx'
 import oapi from '@/api/oilsupplier/supplier'
 import dataapi from '@/api/oilsupplier/dataentry'
+import SubfileList from '@/pages/select/components/subfilelist'
 
 export default {
+  components: {
+    SubfileList
+  },
   created () {
     Object.assign(this.searchFormReset, this.searchForm)
     // 执行初始化方法
@@ -744,12 +756,13 @@ export default {
   },
   data () {
     return {
+      SupplierId: '',
       Id: '',
       SupplierCertId: '',
       SupplierTypeCode: '',
       SupplierName: '',
-      activeName: 'first',
       dialogVisibleCertsSub: false,
+      dialogVisibleSubFile: false,
       HSEOptions: [
         {
           value: '',
@@ -874,7 +887,13 @@ export default {
     search () {
       this.getCertSub()
     },
+    openfilelist (row) {
+      let _this = this
+      _this.dialogVisibleSubFile = true
+      _this.SupplierId = row.Id
+    },
     opencertsub (row) {
+      this.certsubList = []
       this.dialogVisibleCertsSub = true
       this.Id = row.Id
       this.SupplierCertId = row.CertId

src/dashoo.cn/frontend_web/src/pages/select/components/subfilelist.vue

@@ -55,13 +55,17 @@
         authUser: 'authUser'
       })
     },
+    props: {
+      SupplierId: {
+        type: Number,
+        default: 0
+      }
+    },
     data () {
       return {
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
-        SupplierId: 0,
-
         subfileList: [],
 
         selectedorg: [],
@@ -73,6 +77,12 @@
 
       }
     },
+    watch: {
+      SupplierId (val) {
+        this.SupplierId = val
+        this.initData()
+      }
+    },
     created () {
       this.initData()
     },

src/dashoo.cn/frontend_web/src/pages/select/subfileselect/index.vue

@@ -6,7 +6,6 @@
       <el-breadcrumb-item>企业资质</el-breadcrumb-item>
     </el-breadcrumb>
 
-    <!--内框顶部显示-->
     <el-card class="box-card"
              style="height: calc(100vh - 115px);position:relative">
       <div slot="header">
@@ -49,14 +48,9 @@ export default {
     }
   },
   created () {
-    this.initData()
+
   },
   methods: {
-
-    initData () {
-      let _this = this
-      // _this.$refs['subfileList'].getvalue(1798)
-    },
     jstimehandle (val) {
       if (val === '') {
         return '----'