3 ani în urmă · a42015f316
--- a/apps/order/__init__.py
+++ b/apps/order/__init__.py
@@ -44,6 +44,11 @@ HUKOU_CHOICES = (
 
															     (ONE, u'外地'),
														
 
															 )
														
 
															+BOOL_CHOICES = (
														
 
															+    (ZERO, u'是'),
														
 
															+    (ONE, u'否'),
														
 
															+)
														
 
															+
														
 
															 NATIONALITY_CHOICES = (
														
 
															     (ZERO, u'中国大陆（内地）'),
														
 
															     (ONE, u'中国香港'),
														
--- a/apps/order/models.py
+++ b/apps/order/models.py
@@ -98,7 +98,7 @@ class Order(models.Model):
 
															     otype = models.PositiveSmallIntegerField(choices=order.ZHIYE_CHOICES, verbose_name=u"职业类型", default=order.ZERO)
														
 
															     position = models.CharField(max_length=20, verbose_name=u"职位", null=True)
														
 
															-    wbst = models.SmallIntegerField(verbose_name=u"是否挂靠", default=0)
														
 
															+    wbst = models.PositiveSmallIntegerField(choices=order.BOOL_CHOICES, verbose_name=u"是否挂靠", default=order.ONE)
														
 
															     bstname = models.CharField(max_length=100, verbose_name=u"挂靠公司名称", null=True)
														
 
															     bstcode = models.CharField(max_length=100, verbose_name=u"挂靠公司组织机构代码", null=True)
														
 
															     bsttel = models.CharField(max_length=100, verbose_name=u"挂靠公司电话", null=True)
														
@@ -111,7 +111,7 @@ class Order(models.Model):
 
															     ctname = models.CharField(max_length=10, verbose_name=u"联系人2姓名", null=True)
														
 
															     cttel = models.CharField(max_length=11, verbose_name=u"联系人2手机号", null=True)
														
 
															-    thesame = models.SmallIntegerField(verbose_name=u"是否有共同借款人", default=0)
														
 
															+    thesame = models.PositiveSmallIntegerField(choices=order.BOOL_CHOICES, verbose_name=u"是否有共同借款人", default=order.ONE)
														
 
															     tsname = models.CharField(max_length=10, verbose_name=u"共借人姓名", null=True)
														
 
															     tsbdate = models.DateField(verbose_name=u"出生日期", null=True)
														
 
															     tsitype = models.PositiveSmallIntegerField(choices=order.ITYPE_CHOICES, verbose_name=u"身份证件类型", default=order.ZERO)
														
--- a/apps/order/serializers.py
+++ b/apps/order/serializers.py
@@ -67,6 +67,7 @@ class OrderListSerializer(serializers.ModelSerializer):
 
															 class OrderSerializer(serializers.ModelSerializer):
														
 
															     create_user_text = serializers.CharField(source='create_user.name', read_only=True)
														
 
															     laompany_text = serializers.CharField(source='laompany.name', label='产品名称', read_only=True)
														
 
															+    laompany_month = serializers.CharField(source='laompany.month', label='贷款期限', read_only=True)
														
 
															     create_time_f = serializers.DateTimeField(source='create_time', format=settings.SHORT_DATETIME_FORMAT,
														
 
															                                               read_only=True)
														
 
															     seller_text = serializers.CharField(source='seller.name', read_only=True)
														
@@ -86,8 +87,8 @@ class OrderSerializer(serializers.ModelSerializer):
 
															     tsitype_text = serializers.CharField(source='get_tsitype_display', label='身份证件类型', read_only=True)
														
 
															     tsmaddress_text = serializers.CharField(source='get_tsmaddress_display', label='共借人邮寄地址', read_only=True)
														
 
															     mstatus_text = serializers.CharField(source='get_mstatus_display', label='婚姻状况', read_only=True)
														
 
															-    wbst_text = BooleanCharField(source='wbst', label='是否挂靠', read_only=True)
														
 
															-    thesame_text = BooleanCharField(source='thesame', label='是否有共同借款人', read_only=True)
														
 
															+    wbst_text = serializers.CharField(source='get_wbst_display', label='是否挂靠', read_only=True)
														
 
															+    thesame_text = serializers.CharField(source='get_thesame_display', label='是否有共同借款人', read_only=True)
														
 
															     seller_tel = serializers.CharField(source='seller.username', read_only=True)
														
 
															     class Meta:
														
 
															         model = Order
														
--- a/apps/order/views.py
+++ b/apps/order/views.py
@@ -480,7 +480,7 @@ class OrderViewSet(CustomModelViewSet):
 
															         # 不显示字段
														
 
															         show = [
														
 
															             'vmodel', 'invioce', 'ptax', 'insurance', 'boutique', 'wextension', 'upkeep', 'dpratio', 'lamount',
														
 
															-            'laompany_text', 'name', 'sex_text', 'bdate', 'rpr_text', 'nationality_text', 'ntype_text', 'inumber',
														
 
															+            'laompany_text', 'laompany_month', 'name', 'sex_text', 'bdate', 'rpr_text', 'nationality_text', 'ntype_text', 'inumber',
														
 
															             'dincome', 'mstatus_text',
														
 
															             'elevel_text', 'naddress', 'hptype_text', 'maddress_text', 'email', 'wx', 'phone', 'tel', 'wname', 'wphone',
														
 
															             'waddress', 'itype_text', 'otype_text', 'position', 'wbst_text', 'bstname', 'bstcode', 'bsttel',
														
--- a/uis/dist/css/app.e2af3e07.css
+++ b/uis/dist/css/app.e2af3e07.css
--- a/uis/dist/index.html
+++ b/uis/dist/index.html
@@ -1 +1 @@
 
															-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,initial-scale=1,viewport-fit=cover"><link rel="icon" href="logo.png"><script src="qrcode.min.js"></script><title>诺信通金融</title><link href="css/chunk-5548dce5.79027bda.css" rel="prefetch"><link href="js/chunk-5548dce5.c74e43dc.js" rel="prefetch"><link href="css/app.e23a9c5e.css" rel="preload" as="style"><link href="css/chunk-vendors.754acb04.css" rel="preload" as="style"><link href="js/app.caaeb3ee.js" rel="preload" as="script"><link href="js/chunk-vendors.423d661f.js" rel="preload" as="script"><link href="css/chunk-vendors.754acb04.css" rel="stylesheet"><link href="css/app.e23a9c5e.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but nuoxintong doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.423d661f.js"></script><script src="js/app.caaeb3ee.js"></script></body></html>
														
 
															+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,initial-scale=1,viewport-fit=cover"><link rel="icon" href="logo.png"><script src="qrcode.min.js"></script><title>诺信通金融</title><link href="css/chunk-5548dce5.79027bda.css" rel="prefetch"><link href="js/chunk-5548dce5.c74e43dc.js" rel="prefetch"><link href="css/app.e2af3e07.css" rel="preload" as="style"><link href="css/chunk-vendors.754acb04.css" rel="preload" as="style"><link href="js/app.33792732.js" rel="preload" as="script"><link href="js/chunk-vendors.423d661f.js" rel="preload" as="script"><link href="css/chunk-vendors.754acb04.css" rel="stylesheet"><link href="css/app.e2af3e07.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but nuoxintong doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.423d661f.js"></script><script src="js/app.33792732.js"></script></body></html>
														
--- a/uis/dist/js/app.33792732.js
+++ b/uis/dist/js/app.33792732.js
--- a/uis/dist/js/app.33792732.js.map
+++ b/uis/dist/js/app.33792732.js.map
--- a/uis/dist/js/app.caaeb3ee.js
+++ b/uis/dist/js/app.caaeb3ee.js
--- a/uis/dist/js/app.caaeb3ee.js.map
+++ b/uis/dist/js/app.caaeb3ee.js.map
--- a/uis/views/order/order_print.html
+++ b/uis/views/order/order_print.html
@@ -92,23 +92,14 @@
 
															             <div id="print_div">
														
 
															               <h3 align="center" style="font-weight: bold;margin-bottom: 10px;">个人贷款申请表</h3>
														
 
															-              <p class="label">车辆和贷款信息（机动车及与车辆相关的物理附属设备、服务、税费等）</p>
														
 
															               <table border="0px" style="margin-bottom: 10px;">
														
 
															                 <tr>
														
 
															                   <td class="title"></td>
														
 
															                   <td id="vmodel" class="cell"></td>
														
 
															                   <td class="title"></td>
														
 
															                   <td id="invioce" class="cell"></td>
														
 
															-                  <td></td>
														
 
															-                  <td></td>
														
 
															-                </tr>
														
 
															-                <tr>
														
 
															-                  <td class="title">附加品金额</td>
														
 
															-                  <td></td>
														
 
															-                  <td></td>
														
 
															-                  <td></td>
														
 
															-                  <td></td>
														
 
															-                  <td></td>
														
 
															+                  <td class="title"></td>
														
 
															+                  <td id="lamount" class="cell"></td>
														
 
															                 </tr>
														
 
															                 <tr>
														
 
															                   <td class="title"></td>
														
@@ -126,8 +117,16 @@
 
															                   <td></td>
														
 
															                   <td></td>
														
 
															                 </tr>
														
 
															+                  <tr>
														
 
															+                  <td class="title"></td>
														
 
															+                  <td id="dpratio" class="cell"></td>
														
 
															+                  <td class="title"></td>
														
 
															+                  <td id="laompany_text" class="cell"></td>
														
 
															+                  <td class="title"></td>
														
 
															+                  <td id="laompany_month" class="cell"></td>
														
 
															+                </tr>
														
 
															               </table>
														
 
															-              <p class="label">申请人基本信息</p>
														
 
															+              <p class="label"></p>
														
 
															               <table>
														
 
															                 <tr>
														
 
															                   <td class="title"></td>
														
@@ -224,7 +223,7 @@
 
															                   <td></td>
														
 
															                 </tr>
														
 
															               </table>
														
 
															-              <p class="label">紧急联系人信息</p>
														
 
															+              <p class="label"></p>
														
 
															               <table>
														
 
															                 <tr>
														
 
															                   <td class="title"></td>
														
@@ -250,7 +249,7 @@
 
															                   <td></td>
														
 
															                 </tr>
														
 
															               </table>
														
 
															-              <p class="label">共同借款人信息</p>
														
 
															+              <p class="label"></p>
														
 
															               <table>
														
 
															                 <tr>
														
 
															                   <td class="title"></td>
														
@@ -296,6 +295,10 @@
 
															                   <td id="tsmincome" class="cell"></td>
														
 
															                   <td></td>
														
 
															                 </tr>
														
 
															+                <tr>
														
 
															+                  <td class="title"></td>
														
 
															+                  <td id="notes" colspan="2" class="cell"></td>
														
 
															+                </tr>
														
 
															               </table>
														
 
															             </div>
														
 
															           </div>
														
@@ -337,4 +340,4 @@
 
															   </script>
														
 
															 </body>
														
 
															-</html>
														
 
															+</html>