Browse Source

前:导出对比列表;资质没图片的提示

dubch 5 years ago
parent
commit
58bea6d6ac

+ 0 - 3
src/dashoo.cn/frontend_web/src/components/oilsupplier/basisinfo.vue

@@ -738,9 +738,6 @@
     },
     methods: {
       getCountryList (val) {
-        if (this.formData.Country == "") {
-          this.formData.Country = "中国"
-        }
         let tmpJson = JSON.parse(val)
         this.countryListOptions = []
         for (let idx in tmpJson) {

+ 0 - 3
src/dashoo.cn/frontend_web/src/components/oilsupplier/techinfo.vue

@@ -742,9 +742,6 @@
     },
     methods: {
       getCountryList (val) {
-        if (this.formData.Country == "") {
-          this.formData.Country = "中国"
-        }
         let tmpJson = JSON.parse(val)
         this.countryListOptions = []
         for (let idx in tmpJson) {

+ 119 - 2
src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/index.vue

@@ -303,6 +303,8 @@
           <span style="float: right;">
             <el-button type="primary" size="mini" style="margin-left:20px; margin-top: -4px;" @click="importExcel">导入
           </el-button>
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="contrastList()">查看对比列表
+            </el-button>
             <el-button type="warning" size="mini" style="margin-left:10px; margin-top: -4px;" @click="truncateimport()">清空所有导入
             </el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="confirmImport()">确认更新
@@ -380,6 +382,81 @@
         </el-pagination>
       </el-card>
     </el-dialog>
+    <el-dialog title="对比列表"  width="95%" top="5vh" :visible.sync="contrastListvisible">
+      <el-card class="box-card" v-loading="importloading">
+        <div>
+          <!--内框顶部显示-->
+          <el-card class="box-card" style="height: calc(100vh - 115px);position:relative">
+            <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 对比列表
+        </span>
+
+              <el-form :model="searchForm" ref="searchformRef" :inline="true" style="float: right;position:absolute;right:15px;top:10.5px" >
+                <el-form-item label="准入编码">
+                  <el-input size="mini" v-model="searchForm.AccessCardNo" placeholder="请输入内容"></el-input>
+                </el-form-item>
+                <el-form-item label="企业名称">
+                  <el-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入内容"></el-input>
+                </el-form-item>
+
+                <el-form-item>
+                  <el-dropdown split-button type="primary" size="mini" @click="initDatas($event)" @command="searchCommand">
+                    查询
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                      <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                </el-form-item>
+                <el-form-item>
+                  <el-button type="warning" size="mini" @click="delSupplierCertSub">导出</el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+
+            <!--内框表格显示-->
+            <el-table id="rebateSetTable1" :data="conList" size="mini" v-loading="loading" border height="calc(100vh - 243px)"
+                      style="width: 100%" @sort-change="orderby" >
+              <el-table-column label="操作" width="260px" align="center" fixed="right" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <el-button type="text" @click="opencertsub(scope.row)" title="查看待删除准入范围" size="mini" icon="el-icon-document" width="120px">待删除准入范围</el-button>
+                </template>
+              </el-table-column>
+              <!--内框表格剩余栏显示-->
+              <el-table-column label="状态" prop="InFlag" width="100px" align="center">
+                <template slot-scope="scope">
+                  <el-alert v-if="scope.row.InFlag=='1'" :closable="false" style="background:rgba(255,255,255,0.2)" title="准入" type="success" ></el-alert>
+                  <el-alert v-if="scope.row.InFlag=='2'" :closable="false" style="background:rgba(255,255,255,0.2)" title="暂停" type="warning" ></el-alert>
+                  <el-alert v-if="scope.row.InFlag=='3'" :closable="false" style="background:rgba(255,255,255,0.2)" title="取消" type="error"></el-alert>
+                </template>
+              </el-table-column>
+              <el-table-column label="准入编码" width="100px" prop="AccessCardNo" sortable align="center">
+                <template slot-scope="scope" >
+                  <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+              <el-table-column label="准入类别" prop="SupplierTypeCode" align="center">
+                <template slot-scope="scope">
+                  {{transferStr(scope.row.SupplierTypeCode)}}
+                </template>
+              </el-table-column>
+              <el-table-column label="法人代表"  width="100px" prop="LegalPerson" align="center"></el-table-column>
+              <el-table-column label="注册资金(万元)"  width="170px" prop="RegCapital" sortable align="center"></el-table-column>
+              <el-table-column label="移动电话"  width="120px" prop="Mobile" align="center"></el-table-column>
+              <!--<el-table-column label="最后一次年审" width="100px" prop="AuditDate" align="center">-->
+              <!--<template slot-scope="scope">{{ jstimehandle(scope.row.AuditDate) }}</template>-->
+              <!--</el-table-column>-->
+            </el-table>
+
+            <!-- 分页 -->
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
+                           layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount"></el-pagination>
+          </el-card>
+        </div>
+      </el-card>
+    </el-dialog>
     <el-dialog title="高级查询" :visible.sync="importDialogVisible" width="720px">
       <el-form ref="advancedsearchForm" label-width="110px">
         <el-row>
@@ -536,6 +613,7 @@
         },
         // 查询时间
         CreateOn: [],
+        conList: [],
         importCreateOn: [],
         // 查询项
         searchFormReset: {},
@@ -777,8 +855,12 @@
         },
         operationOrganizeData: [],
         AuditStepOptions: [],
-        showcolumn: [
-        ]
+        showcolumn: [],
+        contrastListvisible: false,
+        ContrastLoading: false,
+        contrastsize: 10,
+        contrastcurrentPage: 1,
+        contrastimportCount: 0,
       }
     },
     created () {
@@ -793,8 +875,43 @@
       this.getDictOptions()
     },
     methods: {
+      initContrastDatas (event) {
+        this.ContrastLoading = true
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn != null && this.CreateOn.length === 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        let params = {
+          _size: this.contrastsize,
+          _currentPage: this.contrastcurrentPage,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+          SetupTime: this.SetupTime,
+          CreateOn: myCreateOn.join(','),
+          CheckUId: this.auditorg,
+          FullId: this.selectDept
+        }
+        api.getCompanyList(params, this.searchForm, this.$axios)
+          .then(res => {
+            this.entityList = res.data.items
+            this.contrastimportCount = res.data.currentItemCount
+            this.ContrastLoading = false
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
       showDelSupplierCertSub () {
         this.deleteDialogVisible = true
+        this.initContrastDatas()
+      },
+      contrastList () {
+        this.contrastListvisible = true
       },
       updatasuppiercertsub () {
         // this.$confirm('此操作将更新企业资质, 是否继续?', '提示', {

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -634,7 +634,7 @@ export default {
         Grade: '',
         MgrUnit: '',
         OperType: '',
-        Country: '',
+        Country: '中国',
         MaunAgent: '',
         ConstructTeam: '',
         CommercialNo: '',

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -630,7 +630,7 @@ export default {
         Grade: '',
         MgrUnit: '',
         OperType: '',
-        Country: '',
+        Country: '中国',
         MaunAgent: '',
         ConstructTeam: '',
         CommercialNo: '',

+ 6 - 0
src/dashoo.cn/frontend_web/src/pages/select/components/subfilelist.vue

@@ -125,6 +125,12 @@
           this.importloading = false
           if (res.data.code === 0) {
             let docurl = res.data.item
+            if (docurl === '') {
+              this.$message({
+                type: 'warning',
+                message: '没有资质图片可导出'
+              })
+            }
             // 内网服务器专用
             if (process.client && docurl.indexOf('upfile') === 0) {
               const myDomain = window.location.host