业务查询美容版

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentselect/index.vue

@@ -39,7 +39,7 @@
       </div>
       <el-tabs v-model="activeName" type="border-card">
         <el-tab-pane label="缴费明细表" name="first">
-          <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
+          <el-table :data="entityList" size="mini" height="calc(100vh - 300px)" border style="width: 100%" @sort-change="orderby">
 
             <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="AccessCardNo" label="准入证号"></el-table-column>
             <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>

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

@@ -69,26 +69,16 @@
         </el-form>
       </div>
 
-<!--
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="CreateOn" label="申请日期"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="AccessCardNo" label="准入证号"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="准入类别"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="AccessCardNo" label="办理项目"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="AccessCardNo" label="申请单位"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="CreateBy" label="录入员"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="AccessCardNo" label="电话"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Status" label="状态标识"></el-table-column>
--->
-
-
-
       <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="准入" name="first">
-          <el-table :data="entityList" id="rebateSetTable0" size="mini" border style="width: 100%" @sort-change="orderby">
-            <el-table-column sortable min-width="120" align="center" prop="CreateOn" label="申请日期"></el-table-column>
+          <el-table :data="entityList" id="rebateSetTable0" size="mini" height="calc(100vh - 300px)" border style="width: 100%" @sort-change="orderby">
+            <el-table-column sortable min-width="120" align="center" prop="ApplyTime" label="申请日期">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.ApplyTime) }}
+              </template>
+            </el-table-column>
             <el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="准入证号"></el-table-column>
-            <el-table-column align="center" label="公司名称" prop="SupplierName"></el-table-column>
+            <el-table-column align="center" min-width="150" show-overflow-tooltip label="公司名称" prop="SupplierName"></el-table-column>
             <el-table-column align="center" label="准入类别" prop="SupplierTypeCode">
               <template slot-scope="scope">
                 {{transferStr(scope.row.SupplierTypeCode)}}
@@ -109,10 +99,14 @@
           </el-pagination>
         </el-tab-pane>
         <el-tab-pane label="增项" name="second">
-          <el-table :data="entityList" id="rebateSetTable1" size="mini"  border style="width: 100%" @sort-change="orderby">
-            <el-table-column sortable min-width="120" align="center" prop="CreateOn" label="申请日期"></el-table-column>
+          <el-table :data="entityList" id="rebateSetTable1" size="mini" height="calc(100vh - 300px)" border style="width: 100%" @sort-change="orderby">
+            <el-table-column sortable min-width="120" align="center" prop="ApplyTime" label="申请日期">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.ApplyTime) }}
+              </template>
+            </el-table-column>
             <el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="准入证号"></el-table-column>
-            <el-table-column align="center" label="公司名称" prop="SupplierName"></el-table-column>
+            <el-table-column align="center" min-width="150" show-overflow-tooltip label="公司名称" prop="SupplierName"></el-table-column>
             <el-table-column align="center" label="准入类别" prop="SupplierTypeCode">
               <template slot-scope="scope">
                 {{transferStr(scope.row.SupplierTypeCode)}}
@@ -133,10 +127,14 @@
           </el-pagination>
         </el-tab-pane>
         <el-tab-pane label="年审" name="third">
-          <el-table :data="entityList" id="rebateSetTable2" size="mini" border style="width: 100%" @sort-change="orderby">
-            <el-table-column sortable min-width="120" align="center" prop="CreateOn" label="申请日期"></el-table-column>
+          <el-table :data="entityList" id="rebateSetTable2" size="mini" height="calc(100vh - 300px)" border style="width: 100%" @sort-change="orderby">
+            <el-table-column sortable min-width="120" align="center" prop="ApplyTime" label="申请日期">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.ApplyTime) }}
+              </template>
+            </el-table-column>
             <el-table-column sortable min-width="120" align="center" prop="AccessCardNo" label="准入证号"></el-table-column>
-            <el-table-column align="center" label="公司名称" prop="SupplierName"></el-table-column>
+            <el-table-column align="center" min-width="150" show-overflow-tooltip label="公司名称" prop="SupplierName"></el-table-column>
             <el-table-column align="center" label="类型" prop="SupplierTypeName">
               <template slot-scope="scope">
                 {{transferStr(scope.row.SupplierTypeName)}}
@@ -246,25 +244,17 @@
           Prop: ''
         },
         // 查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        ApplyTime: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
         // 查询项
         searchFormReset: {},
         searchForm: {
           Id: '',
           SupplierTypeCode: '',
+          AccessCardNo: '',
           SupplierName: '',
-          CreateOn: '',
           CreateUserId: '',
-          CreateBy: '',
-          ModifiedOn: '',
-          ModifiedUserId: '',
-          ModifiedBy: ''
-        },
-        entrydetail: {
-          process: '',
-          business: '',
-          instance: '',
-          status: ''
+          Status: '',
+          CreateBy: ''
         },
         tabinx: '0'
       }
@@ -278,15 +268,15 @@
     },
     methods: {
       handleClick (tab) {
-        this.currentPage = 1;
-        this.size= 10;
+        this.currentPage = 1
+        this.size = 10
         this.tabinx = tab.index
         this.initDatas(tab.index)
       },
-      initDatas (val,event) {
+      initDatas (val, event) {
         if (event != null) {
-          this.currentPage = 1;
-          this.size= 10;
+          this.currentPage = 1
+          this.size = 10
         }
         // 分页及列表条件
         let params = {
@@ -296,20 +286,9 @@
           Prop: this.Column.Prop,
           tabinx: val
         }
-        let myCreateOn = []
-        // 解析时间
-        if (this.CreateOn && 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]))
-        }
-        // 查询条件
-        Object.assign(params, this.searchForm)
         // 访问接口
         console.log(params)
-        api.getProcessAuditList(myCreateOn.join(','), params, this.$axios).then(res => {
+        api.getCompanyList(params, this.searchForm, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {