Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_client/src/styles/index.scss

@@ -10,6 +10,7 @@ body {
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
   font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  background-color: #e9e9e9;
 }
 
 label {

hb_server/apps/wpm/models.py

@@ -35,21 +35,3 @@ class ProductFlow(BaseModel):
     产品流转日志
     """
     product = models.ForeignKey(Product, verbose_name='产品', on_delete=models.CASCADE)
-
-
-class Vendor(CommonAModel):
-    """
-    供应商信息
-    """
-    name = models.CharField('供应商名称', max_length=50, unique=True)
-    contact = models.CharField('联系人', max_length=20)
-    contact_phone = models.CharField('联系电话', max_length=11, unique=True)
-    address = models.CharField('地址', max_length=200, null=True, blank=True)
-    description = models.CharField('描述', max_length=200, blank=True, null=True)
-    material = models.CharField('供应的物料', max_length=200, blank=True, null=True)
-    class Meta:
-        verbose_name = '供应商信息'
-        verbose_name_plural = verbose_name
-
-    def __str__(self):
-        return self.name

hb_server/apps/wpm/views.py

@@ -5,9 +5,6 @@ from apps.pum.models import Vendor
 from apps.pum.serializers import VendorSerializer
 from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin
 
-
-
-
 # Create your views here.
 class VendorViewSet(CreateUpdateModelAMixin, ModelViewSet):
     """