准入范围不良记录

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

@@ -562,7 +562,9 @@ func (this *BadRecordController) SerachGoodsCertByCompany() {
 	var tempEntity suppliercertsub.OilSupplierCertSub
 
 	var goodslist []map[string]string
-	sql := "select * from " + OilSupplierCertSubName + " where SupplierId='"+companyId+"' and SupplierTypeCode='01' "+ sqlAdd +" order by CertSubStatus desc,Id asc limit "+ye+","+size+""
+	sql := "select a.*, b.CreateOn badCreateOn, b.BackReason from " + OilSupplierCertSubName + " a"
+	sql = sql + " LEFT JOIN OilSupplierPauseReason b ON b.Id=( SELECT Id FROM OilSupplierPauseReason t WHERE t.CertSubId=a.Id ORDER BY t.Id DESC LIMIT 1)"
+	sql = sql + " where a.SupplierId='"+companyId+"' and a.SupplierTypeCode='01' "+ sqlAdd +" order by a.CertSubStatus desc,a.Id asc limit "+ye+","+size+""
 	goodslist, _ = svc.DBE.QueryString(sql)
 
 	goodsTotal,_:=svc.GetCount(tempEntity,"SupplierId='"+companyId+"' and SupplierTypeCode='01' "+ sqlAdd +"")
@@ -597,7 +599,9 @@ func (this *BadRecordController) SerachBasisCertByCompany() {
 	var tempEntity suppliercertsub.OilSupplierCertSub
 
 	var basislist []map[string]string
-	sql := "select * from " + OilSupplierCertSubName + " where SupplierId='"+companyId+"' and SupplierTypeCode='02' "+ sqlAdd +" order by CertSubStatus desc,Id asc limit "+ye+","+size+""
+	sql := "select a.*, b.CreateOn badCreateOn, b.BackReason from " + OilSupplierCertSubName + " a"
+	sql = sql + " LEFT JOIN OilSupplierPauseReason b ON b.Id=( SELECT Id FROM OilSupplierPauseReason t WHERE t.CertSubId=a.Id ORDER BY t.Id DESC LIMIT 1)"
+	sql = sql + " where a.SupplierId='"+companyId+"' and a.SupplierTypeCode='02' "+ sqlAdd +" order by a.CertSubStatus desc,a.Id asc limit "+ye+","+size+""
 	basislist, _ = svc.DBE.QueryString(sql)
 
 	basisTotal,_:=svc.GetCount(tempEntity,"SupplierId='"+companyId+"' and SupplierTypeCode='02' "+ sqlAdd +"")
@@ -631,7 +635,9 @@ func (this *BadRecordController) SerachTCCertByCompany() {
 	var tempEntity suppliercertsub.OilSupplierCertSub
 
 	var tclist []map[string]string
-	sql := "select * from " + OilSupplierCertSubName + " where SupplierId='"+companyId+"' and SupplierTypeCode='03' "+ sqlAdd +" order by CertSubStatus desc,Id asc limit "+ye+","+size+""
+	sql := "select a.*, b.CreateOn badCreateOn, b.BackReason from " + OilSupplierCertSubName + " a"
+	sql = sql + " LEFT JOIN OilSupplierPauseReason b ON b.Id=( SELECT Id FROM OilSupplierPauseReason t WHERE t.CertSubId=a.Id ORDER BY t.Id DESC LIMIT 1)"
+	sql = sql + " where a.SupplierId='"+companyId+"' and a.SupplierTypeCode='03' "+ sqlAdd +" order by a.CertSubStatus desc,a.Id asc limit "+ye+","+size+""
 	tclist, _ = svc.DBE.QueryString(sql)
 
 	tcTotal,_:=svc.GetCount(tempEntity,"SupplierId='"+companyId+"' and SupplierTypeCode='03' "+ sqlAdd +"")

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

@@ -671,6 +671,7 @@
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column prop="Name"
                                  label="名称"
+                                 width="300px"
                                  align="center"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column prop="CertSubStatus"
@@ -690,6 +691,16 @@
                     <span v-else>——</span>-->
                   </template>
                 </el-table-column>
+                <el-table-column width="150" prop="badCreateOn" label="操作时间">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.badCreateOn+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="BackReason"
+                                 label="原因"
+                                 align="center"
+                                 show-overflow-tooltip>
+                </el-table-column>
                 <el-table-column label=""
                                  align="center"
                                  width="160px"
@@ -720,6 +731,7 @@
                                  align="center"></el-table-column>
                 <el-table-column prop="Name"
                                  label="名称"
+                                 width="300px"
                                  :show-overflow-tooltip="true"
                                  align="center"></el-table-column>
                 <el-table-column prop="CertSubStatus"
@@ -739,6 +751,15 @@
                     <span v-else>——</span>-->
                   </template>
                 </el-table-column>
+                <el-table-column width="150" prop="badCreateOn" label="操作时间">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.badCreateOn+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="BackReason"
+                                 label="原因"
+                                 align="center"
+                                 show-overflow-tooltip></el-table-column>
                 <el-table-column label=""
                                  align="center"
                                  width="160px"
@@ -769,6 +790,7 @@
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column prop="Name"
                                  label="名称"
+                                 width="300px"
                                  align="center"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column prop="CertSubStatus"
@@ -788,6 +810,15 @@
                     <span v-else>——</span>-->
                   </template>
                 </el-table-column>
+                <el-table-column width="150" prop="badCreateOn" label="操作时间">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.badCreateOn+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="BackReason"
+                                 label="原因"
+                                 align="center"
+                                 show-overflow-tooltip></el-table-column>
                 <el-table-column label=""
                                  align="center"
                                  width="160px"

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

@@ -513,6 +513,7 @@
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column prop="Name"
                                  label="名称"
+                                 width="300px"
                                  align="center"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column prop="CertSubStatus"
@@ -528,6 +529,16 @@
                     <span v-else>——</span>
                   </template>
                 </el-table-column>
+                <el-table-column width="150" prop="badCreateOn" label="操作时间">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.badCreateOn+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="BackReason"
+                                 label="原因"
+                                 align="center"
+                                 show-overflow-tooltip>
+                </el-table-column>
                 <el-table-column label=""
                                  align="center"
                                  width="160px"
@@ -559,6 +570,7 @@
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column prop="Name"
                                  label="名称"
+                                 width="300px"
                                  align="center"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column prop="CertSubStatus"
@@ -574,6 +586,16 @@
                     <span v-else>——</span>
                   </template>
                 </el-table-column>
+                <el-table-column width="150" prop="badCreateOn" label="操作时间">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.badCreateOn+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="BackReason"
+                                 label="原因"
+                                 align="center"
+                                 show-overflow-tooltip>
+                </el-table-column>
                 <el-table-column label=""
                                  align="center"
                                  width="160px"
@@ -605,6 +627,7 @@
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column prop="Name"
                                  label="名称"
+                                 width="300px"
                                  align="center"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column prop="CertSubStatus"
@@ -620,6 +643,16 @@
                     <span v-else>——</span>
                   </template>
                 </el-table-column>
+                <el-table-column width="150" prop="badCreateOn" label="操作时间">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.badCreateOn+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="BackReason"
+                                 label="原因"
+                                 align="center"
+                                 show-overflow-tooltip>
+                </el-table-column>
                 <el-table-column label=""
                                  align="center"
                                  width="160px"