2
3
lining 6 роки тому
батько
коміт
be56f5dbda

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

@@ -198,3 +198,18 @@ func (s *OilSupplierService) GetProOrTreeList(ids string, entitiesPtr interface{
 	s.DBE.SQL(sql).Find(entitiesPtr)
 	return
 }
+
+
+func (s *OilSupplierService) GetMyTodoEntitie(supplierTableName, supplierCertTableName string, entitiesPtr interface{}, where string) bool {
+
+	var sql string
+	sql = `select a.Id, a.SupplierName, b.Id as CertId, b.SupplierTypeCode, '1' Type, b.Status `
+	sql += ` from ` + supplierTableName + ` a `
+	sql += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
+	sql += ` where ` + where
+
+	has,_ := s.DBE.SQL(sql).Get(entitiesPtr)
+	return has
+}
+
+

+ 14 - 0
src/dashoo.cn/backend/api/business/oilsupplier/suppliercertappend/oilsuppliercertappendService.go

@@ -148,3 +148,17 @@ func (s *OilSupplierCertAppendService) GetMyPagingEntitiesWithOrderBytbl(supplie
 
 	return total
 }
+
+func (s *OilSupplierCertAppendService) GetTodoEntitie(supplierTableName, supplierCertAppendName string, entitiesPtr interface{}, where string) bool {
+
+	var sql string
+	sql = `select a.SupplierName, b.AppendType SupplierTypeCode, b.Status `
+	sql += ` from ` + supplierTableName + ` a `
+	sql += ` left join ` + supplierCertAppendName + " b on b.SupplierId = a.Id"
+	sql += ` where ` + where
+
+	has,_ := s.DBE.SQL(sql).Get(entitiesPtr)
+	return has
+
+}
+

Різницю між файлами не показано, бо вона завелика
+ 572 - 498
src/dashoo.cn/backend/api/controllers/oilsupplier/todolist.go


+ 3 - 3
src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -13,7 +13,7 @@
               <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="5"></el-option>-->
             </el-select>
           </el-form-item>
           <el-form-item label="类别">
@@ -49,7 +49,7 @@
               <span v-if="scope.row.Type=='2'" style="color:#E6A23C">增项-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
               <span v-if="scope.row.Type=='3'" style="color:#E6A23C">年审-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
               <span v-if="scope.row.Type=='4'" style="color:#E6A23C">信息变更-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
-              <span v-if="scope.row.Type=='5'" style="color:#E6A23C">资质变更-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
+              <!--<span v-if="scope.row.Type=='5'" style="color:#E6A23C">资质变更-{{statusStr(scope.row.Status, scope.row.Type)}}</span>-->
               <span v-if="scope.row.Type=='6'" style="color:#E6A23C">企业注册-待审批</span>
             </template>
           </el-table-column>
@@ -99,7 +99,7 @@
                 <span v-if="scope.row.Type=='2'" style="color:#E6A23C">增项-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
                 <span v-if="scope.row.Type=='3'" style="color:#E6A23C">年审-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
                 <span v-if="scope.row.Type=='4'" style="color:#E6A23C">信息变更-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
-                <span v-if="scope.row.Type=='5'" style="color:#E6A23C">资质变更-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
+                <!--<span v-if="scope.row.Type=='5'" style="color:#E6A23C">资质变更-{{statusStr(scope.row.Status, scope.row.Type)}}</span>-->
                 <span v-if="scope.row.Type=='6'" style="color:#E6A23C">企业注册-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
               </template>
             </el-table-column>

Деякі файли не було показано, через те що забагато файлів було змінено