前后:待办卡死;查询分页

src/dashoo.cn/backend/api/business/oilsupplier/technologyservice/oiltechnologyserviceService.go

@@ -259,7 +259,7 @@ func (s *OilTechnologyServiceService) GetPagingTmpCheckedEntities(entitiesPtr in
 			 LEFT JOIN OilSupplierCert b ON a.Id=b.SupplierId
 			 LEFT JOIN OilSupplierCertSub sub ON b.Id=sub.SupplierCertId
 			 LEFT JOIN OilSupplierFile files ON a.Id=files.SupplierId
-			 LEFT JOIN Base_TableHeader header ON files.NeedFileType=header.Name and header.CategoryCode = '01'
+			 LEFT JOIN Base_TableHeader header ON files.NeedFileType=header.Name and header.CategoryCode = '03'
 			 LEFT JOIN Tmp_OilTechnologyServiceClass class ON sub.Name=class.Name
 			 LEFT JOIN Tmp_OilTechnologyService goods ON class.Id=goods.ClassId
 			 WHERE`

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

@@ -2450,8 +2450,8 @@ func (this *OilGoodsAptitudeController) GetCompareTmpSupplier() {
 		}
 	}
 	Id := this.GetString("Id")
-	SupplierId := this.GetString("SupplierId")
-	SupplierCertId := this.GetString("SupplierCertId")
+	SupplierName := this.GetString("SupplierName")
+	AccessCardNo := this.GetString("AccessCardNo")
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	Code := this.GetString("Code")
 	Name := this.GetString("Name")
@@ -2468,12 +2468,12 @@ func (this *OilGoodsAptitudeController) GetCompareTmpSupplier() {
 		where = where + " and Id like '%" + Id + "%'"
 	}
 
-	if SupplierId != "" {
-		where = where + " and SupplierId like '%" + SupplierId + "%'"
+	if SupplierName != "" {
+		where = where + " and SupplierName like '%" + SupplierName + "%'"
 	}
 
-	if SupplierCertId != "" {
-		where = where + " and SupplierCertId = '" + SupplierCertId + "'"
+	if AccessCardNo != "" {
+		where = where + " and AccessCardNo like '%" + AccessCardNo + "%'"
 	}
 
 	if SupplierTypeCode != "" {

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

@@ -1715,8 +1715,8 @@ func (this *OilTechnologyServiceController) GetCompareTmpSupplier() {
 		}
 	}
 	Id := this.GetString("Id")
-	SupplierId := this.GetString("SupplierId")
-	SupplierCertId := this.GetString("SupplierCertId")
+	SupplierName := this.GetString("SupplierName")
+	AccessCardNo := this.GetString("AccessCardNo")
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	Code := this.GetString("Code")
 	Name := this.GetString("Name")
@@ -1733,12 +1733,12 @@ func (this *OilTechnologyServiceController) GetCompareTmpSupplier() {
 		where = where + " and Id like '%" + Id + "%'"
 	}
 
-	if SupplierId != "" {
-		where = where + " and SupplierId like '%" + SupplierId + "%'"
+	if SupplierName != "" {
+		where = where + " and SupplierName like '%" + SupplierName + "%'"
 	}
 
-	if SupplierCertId != "" {
-		where = where + " and SupplierCertId = '" + SupplierCertId + "'"
+	if AccessCardNo != "" {
+		where = where + " and AccessCardNo like '%" + AccessCardNo + "%'"
 	}
 
 	if SupplierTypeCode != "" {

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

@@ -1,47 +1,47 @@
 <template>
   <div style="overflow-y: auto">
     <el-card class="box-card">
-      <div slot="header">
-        <span>
+      <span>
           <i class="icon icon-table2"></i> 待办/已办
         </span>
-        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="提交时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-                            start-placeholder="提交日期" end-placeholder="提交日期"></el-date-picker>
-          </el-form-item>
-          <el-form-item label="类型">
-            <el-select size="mini" style="width:100px" v-model="searchForm.Type" placeholder="准入类别">
-              <el-option label="全部" value=""></el-option>
-              <el-option label="准入" value="1"></el-option>
-              <el-option label="增项" value="2"></el-option>
-              <el-option label="年审" value="3"></el-option>
-              <el-option label="信息变更" value="4"></el-option>
-              <el-option label="注册审核" value="5"></el-option>
-              <el-option label="待入库" value="7"></el-option>
-              <el-option label="收入业务" value="9"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="类别">
-            <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">
-              <el-option label="全部" value=""></el-option>
-              <el-option label="物资类" value="01"></el-option>
-              <el-option label="基建类" value="02"></el-option>
-              <el-option label="服务类" value="03"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="公司名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
-        <el-tab-pane name="first">
-          <span slot="label">待办任务</span>
-          <el-table
+      <el-form ref="form" :inline="true" style="float: right;">
+        <el-form-item label="提交时间">
+          <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+                          start-placeholder="提交日期" end-placeholder="提交日期"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="类型">
+          <el-select size="mini" style="width:100px" v-model="searchForm.Type" placeholder="准入类别">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="准入" value="1"></el-option>
+            <el-option label="增项" value="2"></el-option>
+            <el-option label="年审" value="3"></el-option>
+            <el-option label="信息变更" value="4"></el-option>
+            <el-option label="注册审核" value="5"></el-option>
+            <el-option label="待入库" value="7"></el-option>
+            <el-option label="收入业务" value="9"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类别">
+          <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="物资类" value="01"></el-option>
+            <el-option label="基建类" value="02"></el-option>
+            <el-option label="服务类" value="03"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="公司名称">
+          <el-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+        </el-form-item>
+      </el-form>
+
+    </el-card>
+    <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+      <el-tab-pane name="first">
+        <span slot="label">待办任务</span>
+        <el-table
           :data="entityListtode"
           size="mini"
           border
@@ -67,9 +67,9 @@
           </el-table-column>
 
           <!--<el-table-column label="当前状态" prop="Status" align="center">-->
-            <!--&lt;!&ndash;<template slot-scope="scope">&ndash;&gt;-->
-              <!--&lt;!&ndash;{{statusStr(scope.row.Status, scope.row.Type)}}&ndash;&gt;-->
-            <!--&lt;!&ndash;</template>&ndash;&gt;-->
+          <!--&lt;!&ndash;<template slot-scope="scope">&ndash;&gt;-->
+          <!--&lt;!&ndash;{{statusStr(scope.row.Status, scope.row.Type)}}&ndash;&gt;-->
+          <!--&lt;!&ndash;</template>&ndash;&gt;-->
           <!--</el-table-column>-->
           <el-table-column label="类别" prop="SupplierTypeCode" align="center">
             <!-- <template slot-scope="scope" v-if="scope.row.Type=='10'">
@@ -111,7 +111,7 @@
           </el-table-column>
 
 
-            <el-table-column label="操作" width="130" align="center" fixed="right">
+          <el-table-column label="操作" width="130" align="center" fixed="right">
             <template slot-scope="scope">
               <el-button type="text" title="办理"  icon="el-icon-edit" size="mini" @click="rowClick(scope.row)">办理</el-button>
               <!--<el-button type="text" title="编辑"  icon="el-icon-s-promotion" size="mini">跟踪</el-button>-->
@@ -127,81 +127,79 @@
                        layout="total, sizes, prev, pager, next, jumper"
                        :total="currentItemCount">
         </el-pagination>
-        </el-tab-pane>
+      </el-tab-pane>
 
-        <el-tab-pane label="已办任务" name="second">
-          <el-table
-            :data="entityListdone"
-            size="mini"
-            border
-            :stripe="true"
-            style="width: 100%"
-            highlight-current-row>
-
-            <el-table-column label="已办类型" prop="Type" align="center">
-              <template slot-scope="scope">
-                <span v-if="scope.row.Type=='1'" style="color:#E6A23C">准入-{{scope.row.TaskName}}</span>
-                <span v-if="scope.row.Type=='2'" style="color:#E6A23C">增项-{{scope.row.TaskName}}</span>
-                <span v-if="scope.row.Type=='3'" style="color:#E6A23C">年审-{{scope.row.TaskName}}</span>
-                <span v-if="scope.row.Type=='4'" style="color:#E6A23C">信息变更-{{scope.row.TaskName}}</span>
-                <span v-if="scope.row.Type=='5'" style="color:#E6A23C">企业注册-待审批</span>
-                <span v-if="scope.row.Type=='8'" style="color:#E6A23C">发票</span>
-                <span v-if="scope.row.Type=='9'" style="color:#E6A23C">目录申请-{{scope.row.TaskName}}</span>
-                <span v-if="scope.row.Type=='10'" style="color:#E6A23C">合同日常评审</span>
-                <span v-if="scope.row.Type=='11'" style="color:#E6A23C">合同年度评审</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="类别" prop="SupplierTypeCode" align="center">
-              <template slot-scope="scope">
-                <span v-if="scope.row.SupplierTypeCode=='01' && scope.row.Type!='10'&&scope.row.Type!='11'">物资类</span>
-                <span v-if="scope.row.SupplierTypeCode=='02' && scope.row.Type!='10'&&scope.row.Type!='11'">基建类</span>
-                <span v-if="scope.row.SupplierTypeCode=='03' && scope.row.Type!='10'&&scope.row.Type!='11'">服务类</span>
-                <span v-if="scope.row.SupplierTypeCode=='4'">信息变更</span>
-                <span v-if="scope.row.SupplierTypeCode=='5'">企业注册</span>
-                <span v-if="scope.row.SupplierTypeCode=='8'">待开发票</span>
-                <span v-if="scope.row.SupplierTypeCode=='9-6'">外部市场</span>
-                <span v-if="scope.row.SupplierTypeCode=='9-7'">收入业务</span>
-                <span v-if="scope.row.SupplierTypeCode=='01' && (scope.row.Type=='10'||scope.row.Type=='11')">供应商</span>
-                <span v-if="scope.row.SupplierTypeCode=='02' && (scope.row.Type=='10'||scope.row.Type=='11')">承包商</span>
-                <span v-if="scope.row.SupplierTypeCode=='03' && (scope.row.Type=='10'||scope.row.Type=='11')">服务商</span>
+      <el-tab-pane label="已办任务" name="second">
+        <el-table
+          :data="entityListdone"
+          size="mini"
+          border
+          :stripe="true"
+          style="width: 100%"
+          highlight-current-row>
 
-              </template>
-            </el-table-column>
+          <el-table-column label="已办类型" prop="Type" align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.Type=='1'" style="color:#E6A23C">准入-{{scope.row.TaskName}}</span>
+              <span v-if="scope.row.Type=='2'" style="color:#E6A23C">增项-{{scope.row.TaskName}}</span>
+              <span v-if="scope.row.Type=='3'" style="color:#E6A23C">年审-{{scope.row.TaskName}}</span>
+              <span v-if="scope.row.Type=='4'" style="color:#E6A23C">信息变更-{{scope.row.TaskName}}</span>
+              <span v-if="scope.row.Type=='5'" style="color:#E6A23C">企业注册-待审批</span>
+              <span v-if="scope.row.Type=='8'" style="color:#E6A23C">发票</span>
+              <span v-if="scope.row.Type=='9'" style="color:#E6A23C">目录申请-{{scope.row.TaskName}}</span>
+              <span v-if="scope.row.Type=='10'" style="color:#E6A23C">合同日常评审</span>
+              <span v-if="scope.row.Type=='11'" style="color:#E6A23C">合同年度评审</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="类别" prop="SupplierTypeCode" align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.SupplierTypeCode=='01' && scope.row.Type!='10'&&scope.row.Type!='11'">物资类</span>
+              <span v-if="scope.row.SupplierTypeCode=='02' && scope.row.Type!='10'&&scope.row.Type!='11'">基建类</span>
+              <span v-if="scope.row.SupplierTypeCode=='03' && scope.row.Type!='10'&&scope.row.Type!='11'">服务类</span>
+              <span v-if="scope.row.SupplierTypeCode=='4'">信息变更</span>
+              <span v-if="scope.row.SupplierTypeCode=='5'">企业注册</span>
+              <span v-if="scope.row.SupplierTypeCode=='8'">待开发票</span>
+              <span v-if="scope.row.SupplierTypeCode=='9-6'">外部市场</span>
+              <span v-if="scope.row.SupplierTypeCode=='9-7'">收入业务</span>
+              <span v-if="scope.row.SupplierTypeCode=='01' && (scope.row.Type=='10'||scope.row.Type=='11')">供应商</span>
+              <span v-if="scope.row.SupplierTypeCode=='02' && (scope.row.Type=='10'||scope.row.Type=='11')">承包商</span>
+              <span v-if="scope.row.SupplierTypeCode=='03' && (scope.row.Type=='10'||scope.row.Type=='11')">服务商</span>
 
-            <el-table-column label="公司名称" prop="SupplierName" align="center"></el-table-column>
+            </template>
+          </el-table-column>
 
-            <el-table-column label="执行人" prop="UserName" align="center"></el-table-column>
+          <el-table-column label="公司名称" prop="SupplierName" align="center"></el-table-column>
 
-            <el-table-column label="完成时间" prop="CreateTime" align="center">
-              <template slot-scope="scope">
-                {{ jstimehandle(timestampToTime(scope.row.CreateTime)) }}
-              </template>
-            </el-table-column>
-            <el-table-column label="当前状态" prop="Status" align="center">
-              <template slot-scope="scope">
-                <span>{{statusStr(scope.row.Status, scope.row.Type)}}</span>
-              </template>
-            </el-table-column>
+          <el-table-column label="执行人" prop="UserName" align="center"></el-table-column>
 
-            <el-table-column label="操作" width="130" align="center" fixed="right">
-              <template slot-scope="scope">
-                <el-button type="text" title="打开"  icon="el-icon-edit" size="mini" @click="rowFinishedClick(scope.row)">打开</el-button>
-                <!--<el-button type="text" title="编辑"  icon="el-icon-s-promotion" size="mini">跟踪</el-button>-->
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-pagination @size-change="handleSizeChangeFinished"
-                         @current-change="handleCurrentChangeFinished"
-                         :current-page="currentPageFinished"
-                         :page-sizes="[10, 15, 20, 25]"
-                         :page-size="sizeFinished"
-                         layout="total, sizes, prev, pager, next, jumper"
-                         :total="currentItemCountFinished">
-          </el-pagination>
-        </el-tab-pane>
-      </el-tabs>
+          <el-table-column label="完成时间" prop="CreateTime" align="center">
+            <template slot-scope="scope">
+              {{ jstimehandle(timestampToTime(scope.row.CreateTime)) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="当前状态" prop="Status" align="center">
+            <template slot-scope="scope">
+              <span>{{statusStr(scope.row.Status, scope.row.Type)}}</span>
+            </template>
+          </el-table-column>
 
-    </el-card>
+          <el-table-column label="操作" width="130" align="center" fixed="right">
+            <template slot-scope="scope">
+              <el-button type="text" title="打开"  icon="el-icon-edit" size="mini" @click="rowFinishedClick(scope.row)">打开</el-button>
+              <!--<el-button type="text" title="编辑"  icon="el-icon-s-promotion" size="mini">跟踪</el-button>-->
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination @size-change="handleSizeChangeFinished"
+                       @current-change="handleCurrentChangeFinished"
+                       :current-page="currentPageFinished"
+                       :page-sizes="[10, 15, 20, 25]"
+                       :page-size="sizeFinished"
+                       layout="total, sizes, prev, pager, next, jumper"
+                       :total="currentItemCountFinished">
+        </el-pagination>
+      </el-tab-pane>
+    </el-tabs>
     <!-- 公司审核信息 -->
     <el-dialog title="企业注册信息" :visible.sync="dialogVisible">
       <el-form label-width="135px" ref="formData" :model="formData" size="small">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/tmpsuppliercheck.vue

@@ -13,7 +13,7 @@
             <el-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入内容"></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" size="mini" style="margin-left: 8px" @click="initDatas($event)">查询</el-button>
+            <el-button type="primary" size="mini" style="margin-left: 8px" @click="search1">查询</el-button>
           </el-form-item>
           <el-form-item>
             <el-button type="warning" size="mini" @click="exportExcel" :loading="loadingExcel">导出</el-button>
@@ -360,6 +360,10 @@
           return '是'
         }
       },
+      search1 () {
+        this.currentPage = 1
+        this.initDatas()
+      },
       initDatas () {
         this.loading = true
         // 分页及列表条件
@@ -395,7 +399,6 @@
         this.currentPageSub = 1
         this.certsubList = []
         this.dialogVisibleCertsSub = true
-        this.certsubListLoading = true
         this.Id = row.Id
         this.SupplierCertId = row.CertId
         this.SupplierTypeCode = row.SupplierTypeCode
@@ -404,6 +407,7 @@
       },
       getCertSub (row) {
         let _this = this
+        _this.certsubListLoading = true
         const params = {
           SupplierCertId: this.SupplierCertId,
           SupplierTypeCode: this.SupplierTypeCode,
@@ -476,6 +480,7 @@
         })
       },
       search () {
+        this.currentPageSub = 1
         this.getCertSub()
       },
       delcertsubbyid (row) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/technologyservice/tmpsuppliercheck.vue

@@ -13,7 +13,7 @@
             <el-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入内容"></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" size="mini" style="margin-left: 8px" @click="initDatas($event)">查询</el-button>
+            <el-button type="primary" size="mini" style="margin-left: 8px" @click="search1">查询</el-button>
           </el-form-item>
           <el-form-item>
             <el-button type="warning" size="mini" @click="exportExcel" :loading="loadingExcel">导出</el-button>
@@ -393,7 +393,6 @@
         this.currentPageSub = 1
         this.certsubList = []
         this.dialogVisibleCertsSub = true
-        this.certsubListLoading = true
         this.Id = row.Id
         this.SupplierCertId = row.CertId
         this.SupplierTypeCode = row.SupplierTypeCode
@@ -401,6 +400,7 @@
         this.getCertSub(row)
       },
       getCertSub (row) {
+        this.certsubListLoading = true
         let _this = this
         const params = {
           SupplierCertId: this.SupplierCertId,
@@ -474,8 +474,13 @@
         })
       },
       search () {
+        this.currentPageSub = 1
         this.getCertSub()
       },
+      search1 () {
+        this.currentPage = 1
+        this.initDatas()
+      },
       delcertsubbyid (row) {
         console.log(row)
         this.$confirm('是否删除准入项?', '提示', {

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

@@ -774,7 +774,7 @@
                 </el-form>
               </span>
             </div>
-            <el-table :data="certsubList" border size="mini">
+            <el-table :data="certsubList" border size="mini" v-loading="subLoading">
               <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
               <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
               <el-table-column prop="GoodsLevel" label="级别" width="80px" show-overflow-tooltip>
@@ -1273,6 +1273,9 @@ export default {
     this.getDictOptions2()
     // watermark.set("大港油田企业法规处")
   },
+  activated() {
+    this.currentPageSub = 1
+  },
   data () {
     return {
       showBackReason: false,
@@ -1294,6 +1297,7 @@ export default {
       dialogVisibleSubFile: false,
       dialogImportSubFile: false,
       loading: false,
+      subLoading: false,
       Spesearch: '',
       orgOptions: [],
       auditorg: '',
@@ -1664,6 +1668,7 @@ export default {
       })
     },
     search () {
+      this.currentPageSub = 1
       this.getCertSub()
     },
     openfilelist (row) {
@@ -1675,6 +1680,7 @@ export default {
     },
     opencertsub (row) {
       this.certsubList = []
+      this.currentPageSub = 1
       this.dialogVisibleCertsSub = true
       this.Id = row.Id
       this.SupplierCertId = row.CertId
@@ -1684,6 +1690,7 @@ export default {
     },
     getCertSub (row) {
       let _this = this
+      _this.subLoading = true
       const params = {
         SupplierCertId: this.SupplierCertId,
         SupplierTypeCode: this.SupplierTypeCode,
@@ -1697,6 +1704,7 @@ export default {
         .then(res => {
           _this.certsubList = res.data.items
           _this.currentItemCountSub = res.data.currentItemCount
+          _this.subLoading = false
         })
         .catch(err => {
           console.error(err)