Merge branch 'master' into Dev

resources/views/script/AddSupplierScript.blade.php

@@ -14,17 +14,16 @@
                 $('#account_name_label').text('账户名称 : ');
                 $('#account_name_label').text('账户名称 : ');
                 $('#account_name_require_span').hide();
                 $('#account_name_require_span').hide();
                 $('#bank_address_require_span').hide();
                 $('#bank_address_require_span').hide();
-                $('#nation_id').val('36');
-                $('#nation_id').attr('disabled', true);
-                $('#nation_id').addClass('layui-disabled');
+                $('#receipt_nation_id').val('36');
                 form.render('select');
                 form.render('select');
             } else {
             } else {
                 $('#swift_code_div').show();
                 $('#swift_code_div').show();
                 $('#account_name_label').text('国外受益人 : ');
                 $('#account_name_label').text('国外受益人 : ');
                 $('#account_name_require_span').show();
                 $('#account_name_require_span').show();
                 $('#bank_address_require_span').show();
                 $('#bank_address_require_span').show();
-                $('#nation_id').attr('disabled', false);
-                $('#nation_id').removeClass('layui-disabled');
+                $('#receipt_nation_id').attr('disabled', false);
+                $('#receipt_nation_id').val('');
+                $('#receipt_nation_id').removeClass('layui-disabled');
                 form.render('select');
                 form.render('select');
             }
             }
         });
         });