Pārlūkot izejas kodu

前后:供方信息查询loading

dubch 5 gadi atpakaļ
vecāks
revīzija
8c69e7358c

+ 1 - 0
src/dashoo.cn/backend/api/business/oilsupplier/technologyservice/oiltechnologyservice.go

@@ -184,6 +184,7 @@ type OilTechnologyServiceTmp struct {
 	TmpF51               string    `json:"tmpF51"`
 	TmpF52               string    `json:"tmpF52"`
 	TmpName              string    `json:"tmpName"`
+	Checked		 		 int    `json:"checked"`
 
 	Remark            string    `xorm:"comment('备注') VARCHAR(500)"`
 	DeletionStateCode int       `xorm:"default 0 comment('删除状态,0正常,1已删除') INT(10)"`

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

@@ -762,14 +762,14 @@
               <span style="float: right;">
                 <el-form ref="form" :inline="true" style="margin-top: -10px">
                   <el-form-item label="编码">
-                    <el-input size="mini" v-model="searchFormSub.Code" style="width: 100%"></el-input>
+                    <el-input size="mini" v-model="searchFormSub.Code" placeholder="请输入编码" style="width: 100%"></el-input>
                   </el-form-item>
                   <el-form-item label="名称">
-                    <el-input size="mini" v-model="searchFormSub.Name" style="width: 100%"></el-input>
+                    <el-input size="mini" v-model="searchFormSub.Name" placeholder="请输入名称" style="width: 100%"></el-input>
                   </el-form-item>
                   <el-form-item>
                     <el-button type="primary" size="mini" style="margin-left: 8px" @click="search">查询</el-button>
-                    <el-button type="primary" @click="toPdf" size="mini" style="margin-left: 25px">下载准入范围</el-button>
+                    <el-button type="primary" @click="toPdf" size="mini" style="margin-left: 25px" :loading="pdfLoading">下载准入范围</el-button>
                   </el-form-item>
                 </el-form>
               </span>
@@ -1425,6 +1425,7 @@ export default {
         Name: ''
       },
       countryoptions: [],
+      pdfLoading: false,
       TableHeaderList: [],
 
       certsubList: [],
@@ -1807,6 +1808,7 @@ export default {
     },
     // 导出到Word文件
     toWord (val) {
+      this.loading = true
       let params = {
         CertId: val.CertId
       }
@@ -1827,12 +1829,14 @@ export default {
               location.href = 'http://' + docurl
             }
           }
+          this.loading = false
         }).catch(err => {
           console.error(err)
         })
     },
     // 导出准入范围到pdf
     toPdf () {
+      this.pdfLoading = true
       dataapi.pdfexport(this.Id, this.SupplierTypeCode, this.$axios)
         .then(res => {
           // response
@@ -1856,6 +1860,7 @@ export default {
                 .then(function (res) {
                   window.open('http://' + myDomain + '/' + res.data)
                 })
+              this.pdfLoading = false
             } else {
               // location.href = 'http://' + docurl
               pdfurl = 'http://' + docurl
@@ -1867,6 +1872,7 @@ export default {
                 .then(function (res) {
                   window.open('http://' + res.data)
                 })
+              this.pdfLoading = false
             }
           }
         }).catch(err => {