Skip to content

Commit

Permalink
V 2.1.17
Browse files Browse the repository at this point in the history
  • Loading branch information
Singosgu committed May 22, 2022
1 parent e4ea09f commit f863a9d
Show file tree
Hide file tree
Showing 47 changed files with 164 additions and 121 deletions.
8 changes: 4 additions & 4 deletions asn/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class AsnListModel(models.Model):

class Meta:
db_table = 'asnlist'
verbose_name = 'asnlist'
verbose_name_plural = "asnlist"
verbose_name = 'ASN_List'
verbose_name_plural = "ASN_List"
ordering = ['-id']

def __str__(self):
Expand Down Expand Up @@ -46,8 +46,8 @@ class AsnDetailModel(models.Model):

class Meta:
db_table = 'asndetail'
verbose_name = 'asndetail'
verbose_name_plural = "asndetail"
verbose_name = 'ASN_Detail'
verbose_name_plural = "ASN_Detail"
ordering = ['-id']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions binproperty/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'binproperty'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Bin Property'
verbose_name_plural = "Bin_Property"
ordering = ['bin_property']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions binset/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'binset'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Bin_Set'
verbose_name_plural = "Bin_Set"
ordering = ['bin_name']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions binsize/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'binsize'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Bin_Size'
verbose_name_plural = "Bin_Size"
ordering = ['-id']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions capital/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'capital'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Capital'
verbose_name_plural = "Capital"
ordering = ['-id']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions chat/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'chat'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Chat'
verbose_name_plural = "Chat"
ordering = ['-id']

def __str__(self):
Expand Down
6 changes: 3 additions & 3 deletions company/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class ListModel(models.Model):
company_name = models.CharField(max_length=255, verbose_name="Company Name")
company_city = models.CharField(max_length=255, verbose_name="Company City")
company_address = models.CharField(max_length=255, verbose_name="Company Address")
company_contact = models.BigIntegerField(default=0, verbose_name="Company Contact")
company_contact = models.CharField(max_length=255, verbose_name="Company Contact")
company_manager = models.CharField(max_length=255, verbose_name="Company Manager")
creater = models.CharField(max_length=255, verbose_name="Who Created")
openid = models.CharField(max_length=255, verbose_name="Openid")
Expand All @@ -14,8 +14,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'company'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Company'
verbose_name_plural = "Company"
ordering = ['company_name']

def __str__(self):
Expand Down
8 changes: 4 additions & 4 deletions company/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class CompanyGetSerializer(serializers.ModelSerializer):
company_name = serializers.CharField(read_only=True, required=False)
company_city = serializers.CharField(read_only=True, required=False)
company_address = serializers.CharField(read_only=True, required=False)
company_contact = serializers.IntegerField(read_only=True, required=False)
company_contact = serializers.CharField(read_only=True, required=False)
company_manager = serializers.CharField(read_only=True, required=False)
creater = serializers.CharField(read_only=True, required=False)
create_time = serializers.DateTimeField(read_only=True, format='%Y-%m-%d %H:%M:%S')
Expand All @@ -21,7 +21,7 @@ class CompanyPostSerializer(serializers.ModelSerializer):
company_name = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
company_city = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
company_address = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
company_contact = serializers.IntegerField(read_only=False, required=True, validators=[datasolve.data_validate])
company_contact = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
company_manager = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
creater = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
class Meta:
Expand All @@ -33,7 +33,7 @@ class CompanyUpdateSerializer(serializers.ModelSerializer):
company_name = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
company_city = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
company_address = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
company_contact = serializers.IntegerField(read_only=False, required=True, validators=[datasolve.data_validate])
company_contact = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
company_manager = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
creater = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
class Meta:
Expand All @@ -45,7 +45,7 @@ class CompanyPartialUpdateSerializer(serializers.ModelSerializer):
company_name = serializers.CharField(read_only=False, required=False, validators=[datasolve.data_validate])
company_city = serializers.CharField(read_only=False, required=False, validators=[datasolve.data_validate])
company_address = serializers.CharField(read_only=False, required=False, validators=[datasolve.data_validate])
company_contact = serializers.IntegerField(read_only=False, required=False, validators=[datasolve.data_validate])
company_contact = serializers.CharField(read_only=False, required=False, validators=[datasolve.data_validate])
company_manager = serializers.CharField(read_only=False, required=False, validators=[datasolve.data_validate])
creater = serializers.CharField(read_only=False, required=False, validators=[datasolve.data_validate])
class Meta:
Expand Down
4 changes: 2 additions & 2 deletions customer/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'customer'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Customer'
verbose_name_plural = "Customer"
ordering = ['customer_name']

def __str__(self):
Expand Down
8 changes: 4 additions & 4 deletions cyclecount/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class QTYRecorder(models.Model):

class Meta:
db_table = 'qtyrecorder'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'QTY_Recorder'
verbose_name_plural = "QTY_Recorder"
ordering = ['-id']

def __str__(self):
Expand All @@ -34,8 +34,8 @@ class CyclecountModeDayModel(models.Model):

class Meta:
db_table = 'cyclecountday'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Cyclecount_Day'
verbose_name_plural = "Cyclecount_Day"
ordering = ['openid']

def __str__(self):
Expand Down
8 changes: 4 additions & 4 deletions dn/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class DnListModel(models.Model):

class Meta:
db_table = 'dnlist'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'DN_List'
verbose_name_plural = "DN_List"
ordering = ['-id']

def __str__(self):
Expand Down Expand Up @@ -50,8 +50,8 @@ class DnDetailModel(models.Model):

class Meta:
db_table = 'dndetail'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'DN_Detail'
verbose_name_plural = "DN_Detail"
ordering = ['-id']

def __str__(self):
Expand Down
8 changes: 4 additions & 4 deletions driver/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'driver'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Driver'
verbose_name_plural = "Driver"
ordering = ['driver_name']

def __str__(self):
Expand All @@ -30,8 +30,8 @@ class DispatchListModel(models.Model):

class Meta:
db_table = 'dispatchlist'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Dispatch_List'
verbose_name_plural = "Dispatch_List"
ordering = ['-create_time']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions goods/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'goods'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Goods_List'
verbose_name_plural = "Goods_List"
ordering = ['-id']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions goodsbrand/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'goodsbrand'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Goods_Brand'
verbose_name_plural = "Goods_Brand"
ordering = ['goods_brand']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions goodsclass/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'goodsclass'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Goods_Class'
verbose_name_plural = "Goods_Class"
ordering = ['goods_class']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions goodscolor/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'goodscolor'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Goods_Color'
verbose_name_plural = "Goods_Color"
ordering = ['goods_color']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions goodsorigin/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'goodsorigin'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Goods_Origin'
verbose_name_plural = "Goods_Origin"
ordering = ['goods_origin']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions goodsshape/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'goodsshape'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Goods_Shape'
verbose_name_plural = "Goods_Shape"
ordering = ['goods_shape']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions goodsspecs/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'goodsspecs'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Goods_Specs'
verbose_name_plural = "Goods_Specs"
ordering = ['goods_specs']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions goodsunit/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'goodsunit'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Goods_Unit'
verbose_name_plural = "Goods_Unit"
ordering = ['goods_unit']

def __str__(self):
Expand Down
2 changes: 1 addition & 1 deletion greaterwms/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def return_static(request, path, insecure=True, **kwargs):
return serve(request, path, insecure, **kwargs)

urlpatterns = [
# path('admin/', admin.site.urls),
path('admin/', admin.site.urls),
path('', TemplateView.as_view(template_name='dist/spa/index.html')),
path('vcheck/', views.vcheck, name='vcheck'),
path('myip/', views.myip, name='myip'),
Expand Down
4 changes: 2 additions & 2 deletions payment/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class TransportationFeeListModel(models.Model):

class Meta:
db_table = 'transportationfee'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Transportation_Fee'
verbose_name_plural = "Transportation_Fee"
ordering = ['-id']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions scanner/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'scanner'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Scanner'
verbose_name_plural = "Scanner"
ordering = ['-id']

def __str__(self):
Expand Down
4 changes: 2 additions & 2 deletions shopid/models/douyinmodels.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class ListModel(models.Model):

class Meta:
db_table = 'douyinshop'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'DouYin_Shop'
verbose_name_plural = "DouYin_Shop"
ordering = ['id']

def __str__(self):
Expand Down
8 changes: 4 additions & 4 deletions staff/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class ListModel(models.Model):
is_lock = models.BooleanField(default=False,verbose_name='Whether the lock')
class Meta:
db_table = 'staff'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Staff'
verbose_name_plural = "Staff"
ordering = ['staff_name']

def __str__(self):
Expand All @@ -28,8 +28,8 @@ class TypeListModel(models.Model):

class Meta:
db_table = 'stafftype'
verbose_name = 'data id'
verbose_name_plural = "data id"
verbose_name = 'Staff_Type'
verbose_name_plural = "Staff_Type"
ordering = ['staff_type']

def __str__(self):
Expand Down
2 changes: 1 addition & 1 deletion static_new/rest_framework/css/default.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ td.nested > table {
margin: 0;
}

form select, form input, form textarea {
form select, form input:not([type=checkbox]), form textarea {
width: 90%;
}

Expand Down
Loading

0 comments on commit f863a9d

Please sign in to comment.