Ver Fonte

业务流程查询功能

yuedefeng há 6 anos atrás
pai
commit
7174da72c6

+ 2 - 2
src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierService.go

@@ -245,7 +245,7 @@ func (s *OilSupplierService) GetProcessInfoWithOrderBytbl(supplierTableName, sup
 	sqlCount += ` where ` + where
 
 	var sql string
-	sql = `select a.SupplierName, b.Id, `
+	sql = `select a.SupplierName, b.Id, b.AccessCardNo, b.CreateOn, b.AddinTime, b.RecUnitName, a.ContactName, a.Mobile, `
 	sql += ` b.Status, b.SupplierTypeCode, `
 	sql += ` b.WorkflowId, b.ProcessKey, '1' as Type, b.CreateOn`
 	sql += ` from ` + supplierTableName + ` a `
@@ -256,7 +256,7 @@ func (s *OilSupplierService) GetProcessInfoWithOrderBytbl(supplierTableName, sup
 	} else {
 		sql += ` order by ` + orderby + ` DESC `
 	}
-	if (pageIndex != 0 && itemsPerPage !=0) {
+	if (pageIndex != 0 && itemsPerPage != 0) {
 		sql += ` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
 	}
 	s.DBE.SQL(sql).Find(entitiesPtr)

+ 4 - 0
src/dashoo.cn/backend/api/controllers/oilsupplier/select.go

@@ -47,6 +47,10 @@ type Processinfo struct {
 	Status         		string
 	Type                string
 	CreateOn            time.Time
+	AddinTime			time.Time
+	RecUnitName			string
+	ContactName			string
+	Mobile				string
 }
 
 // @Title 获取所有

+ 70 - 0
src/dashoo.cn/frontend_web/src/pages/select/processselect/index.vue

@@ -41,7 +41,21 @@
       <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="综合" name="all">
           <el-table :data="entityListAll" id="rebateSetTableAll" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
+            <el-table-column align="center" label="准入证号" prop="AccessCardNo"></el-table-column>
             <el-table-column align="center" label="公司名称" prop="SupplierName"></el-table-column>
+            <el-table-column align="center" label="申请时间" prop="CreateOn">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.CreateOn+'') }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="完成时间" prop="AddinTime">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.AddinTime+'') }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="推荐单位" prop="RecUnitName"></el-table-column>
+            <el-table-column align="center" label="申报人员" prop="ContactName"></el-table-column>
+            <el-table-column align="center" label="联系电话" prop="Mobile"></el-table-column>
             <el-table-column align="center" label="类别" prop="Type">
               <template slot-scope="scope">
                 {{typeStr(scope.row.Type)}}
@@ -69,7 +83,21 @@
         </el-tab-pane>
         <el-tab-pane label="准入" name="first">
           <el-table :data="entityList" id="rebateSetTable0" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
+            <el-table-column align="center" label="准入证号" prop="AccessCardNo"></el-table-column>
             <el-table-column align="center" label="公司名称" prop="SupplierName"></el-table-column>
+            <el-table-column align="center" label="申请时间" prop="CreateOn">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.CreateOn+'') }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="完成时间" prop="AddinTime">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.AddinTime+'') }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="推荐单位" prop="RecUnitName"></el-table-column>
+            <el-table-column align="center" label="申报人员" prop="ContactName"></el-table-column>
+            <el-table-column align="center" label="联系电话" prop="Mobile"></el-table-column>
             <el-table-column align="center" label="类型" prop="SupplierTypeCode">
               <template slot-scope="scope">
                 {{transferStr(scope.row.SupplierTypeCode)}}
@@ -92,7 +120,21 @@
         </el-tab-pane>
         <el-tab-pane label="增项" name="second">
           <el-table :data="entityList1" id="rebateSetTable1" size="mini"  border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
+            <el-table-column align="center" label="准入证号" prop="AccessCardNo"></el-table-column>
             <el-table-column align="center" label="公司名称" prop="SupplierName"></el-table-column>
+            <el-table-column align="center" label="申请时间" prop="CreateOn">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.CreateOn+'') }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="完成时间" prop="AddinTime">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.AddinTime+'') }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="推荐单位" prop="RecUnitName"></el-table-column>
+            <el-table-column align="center" label="申报人员" prop="ContactName"></el-table-column>
+            <el-table-column align="center" label="联系电话" prop="Mobile"></el-table-column>
             <el-table-column align="center" label="类型" prop="SupplierTypeCode">
               <template slot-scope="scope">
                 {{transferStr(scope.row.SupplierTypeCode)}}
@@ -115,7 +157,21 @@
         </el-tab-pane>
         <el-tab-pane label="年审" name="third">
           <el-table :data="entityList2" id="rebateSetTable2" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
+            <el-table-column align="center" label="准入证号" prop="AccessCardNo"></el-table-column>
             <el-table-column align="center" label="公司名称" prop="SupplierName"></el-table-column>
+            <el-table-column align="center" label="申请时间" prop="CreateOn">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.CreateOn+'') }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="完成时间" prop="AddinTime">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.AddinTime+'') }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="推荐单位" prop="RecUnitName"></el-table-column>
+            <el-table-column align="center" label="申报人员" prop="ContactName"></el-table-column>
+            <el-table-column align="center" label="联系电话" prop="Mobile"></el-table-column>
             <el-table-column align="center" label="类型" prop="SupplierTypeCode">
               <template slot-scope="scope">
                 {{transferStr(scope.row.SupplierTypeCode)}}
@@ -146,7 +202,21 @@
         </el-tab-pane>
         <el-tab-pane label="变更申请" name="fourth">
           <el-table :data="entityList3" id="rebateSetTable3" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
+            <el-table-column align="center" label="准入证号" prop="AccessCardNo"></el-table-column>
             <el-table-column align="center" label="公司名称" prop="SupplierName"></el-table-column>
+            <el-table-column align="center" label="申请时间" prop="CreateOn">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.CreateOn+'') }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="完成时间" prop="AddinTime">
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.AddinTime+'') }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="推荐单位" prop="RecUnitName"></el-table-column>
+            <el-table-column align="center" label="申报人员" prop="ContactName"></el-table-column>
+            <el-table-column align="center" label="联系电话" prop="Mobile"></el-table-column>
             <el-table-column align="center" label="当前状态" prop="Status">
               <template slot-scope="scope">
                 <span v-if="scope.row.Status=='0'">待提交</span>