前后:准入状态查询

src/dashoo.cn/backend/api/business/tmpzcgf/tmpzcgfSession.go

@@ -122,8 +122,8 @@ FROM
 
 func (s *TmpzcgtSession) InsertSupplierCert() error {
 	s.DBE.Query("SET unique_checks=0;")
-	sql := "INSERT INTO OilSupplierCert (SupplierId,OutsideFlog, `Status` , Step, WorkerTotal, AccessCardNo,SupplierTypeName,InFlag,EffectStartTime,EffectEndTime,ApplyTime,Remark,CreateBy,GfID) " +
-		"SELECT -1 As SupplierId,企业名称 AS OutsideFlog,'8' As `Status`, 3 as Step, 1 as WorkerTotal, 准入证号 As AccessCardNo,准入类别 AS SupplierTypeName,准入标识 AS InFlag, STR_TO_DATE(IF(有效期起='', NULL, 有效期起),'%Y年%m月%d日') AS EffectStartTime, STR_TO_DATE(IF(有效期止='', NULL, 有效期止),'%Y年%m月%d日') AS EffectEndTime,(SELECT STR_TO_DATE(IF(MAX(年审日期)='', NULL, MAX(年审日期)),'%Y-%m-%d') from T_年审 b WHERE b.企业名称 = a.企业名称 AND b.状态标识='办理完毕') AS ApplyTime,备注 AS Remark,'导入' As CreateBy,ID " +
+	sql := "INSERT INTO OilSupplierCert (SupplierId,OutsideFlog, `Status` , Step, WorkerTotal, AccessCardNo,SupplierTypeName,InFlag,EffectStartTime,EffectEndTime,ApplyTime,Remark,CreateBy,GfID,RecUnitName,MgrUnit,RecDate) " +
+		"SELECT -1 As SupplierId,企业名称 AS OutsideFlog,'8' As `Status`, 3 as Step, 1 as WorkerTotal, 准入证号 As AccessCardNo,准入类别 AS SupplierTypeName,准入标识 AS InFlag, STR_TO_DATE(IF(有效期起='', NULL, 有效期起),'%Y年%m月%d日') AS EffectStartTime, STR_TO_DATE(IF(有效期止='', NULL, 有效期止),'%Y年%m月%d日') AS EffectEndTime,(SELECT STR_TO_DATE(IF(MAX(年审日期)='', NULL, MAX(年审日期)),'%Y-%m-%d') from T_年审 b WHERE b.企业名称 = a.企业名称 AND b.状态标识='办理完毕') AS ApplyTime,备注 AS Remark,'导入' As CreateBy,ID,推荐单位名称,管理单位,推荐日期 " +
 		"FROM T_资格预审表 a ;" //WHERE 准入标识 != '取消'
 	// s.DBE.Query("SET @@SESSION.sql_mode='ALLOW_INVALID_DATES'")
 	_, err := s.DBE.Query(sql)

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

@@ -81,6 +81,7 @@ func (this *SelectController) GetTList() {
 	orderby := "a.Id"
 	asc := true
 	Order := this.GetString("Order")
+	InFlag := this.GetString("InFlag")
 	Prop := this.GetString("Prop")
 	CheckUId := this.GetString("CheckUId")
 	FullId := this.GetString("FullId")
@@ -95,6 +96,11 @@ func (this *SelectController) GetTList() {
 	if model.AccessCardNo != "" {
 		where = where + " and b.AccessCardNo like '%" + model.AccessCardNo + "%'"
 	}
+
+	if InFlag != "" {
+		where = where + " and b.InFlag = " + InFlag
+	}
+
 	//企业名称
 	if model.SupplierName != "" {
 		where = where + " and a.SupplierName like '%" + model.SupplierName + "%'"

src/dashoo.cn/backend/api/controllers/tmpzcgf/tmpzcgf.go

@@ -46,7 +46,7 @@ func (this *TmpzcgfController) InsertSupplier() {
 	fmt.Println(elapsed)
 }
 
-// @Title 更新SupplierCert
+// @Title 导入SupplierCert
 // @Description get user by token
 // @Success 200 {object}
 // @router /insertsuppliercert [get]

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

@@ -39,6 +39,14 @@
               <el-option label="服务类" value="03"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="准入状态">
+            <el-select size="mini" style="width:150px" v-model="InFlag" 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-select>
+          </el-form-item>
 
           <el-form-item>
             <el-dropdown
@@ -99,7 +107,7 @@
                           fixed="left">
         </el-table-column>
         <!--内框表格剩余栏显示-->
-        <el-table-column label="状态" prop="InFlag" width="100px" align="center">
+        <el-table-column label="状态" prop="InFlag" width="100px" align="center" sortable>
           <template slot-scope="scope">
             <el-alert
               v-if="scope.row.InFlag=='1'"
@@ -1371,6 +1379,7 @@ export default {
         Remark: ''
       },
       show: false,
+      InFlag: '',
       // 定义列表数据
       entityList: [],
       // 分页参数
@@ -1964,7 +1973,7 @@ export default {
       this.initDatas()
     },
     jstimehandle (val) {
-      if (val === '') {
+      if (val === '' || val === undefined) {
         return '----'
       } else if (val === '0001-01-01T08:00:00+08:00') {
         return '----'
@@ -2001,6 +2010,7 @@ export default {
         SetupTime: this.SetupTime,
         CreateOn: myCreateOn.join(','),
         CheckUId: this.auditorg,
+        InFlag: this.InFlag,
         FullId: this.selectDept
       }
       api