Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 7ef0096c by 朱继来
Options

Merge branch 'zjl_inquiry_order_20210311'

parents d2188fd3 da0b8dbf
Inline Side-by-side
Showing with 44 additions and 44 deletions
public/js/add_order.js
...@@ -769,54 +769,54 @@ ...@@ -769,54 +769,54 @@
// } // }
} }
if (type == 1 && is_dgk) { // 联营包含digikey商品，则填写终端资料 // if (type == 1 && is_dgk) { // 联营包含digikey商品，则填写终端资料
var customer_cn = $('.customer_cn').val(); // var customer_cn = $('.customer_cn').val();
var customer_en = $('.customer_en').val(); // var customer_en = $('.customer_en').val();
var customer_type = $('.customer_type').val(); // var customer_type = $('.customer_type').val();
var product_use_classone_sn = $('.product_use_classone_sn').val(); // var product_use_classone_sn = $('.product_use_classone_sn').val();
var product_use_classtwo_sn = $('.product_use_classtwo_sn').val(); // var product_use_classtwo_sn = $('.product_use_classtwo_sn').val();
var customer_website = $('.customer_website').val(); // var customer_website = $('.customer_website').val();
if (!customer_cn) { // if (!customer_cn) {
layer.msg('请填写终端中文名称'); // layer.msg('请填写终端中文名称');
return false; // return false;
} // }
if (customer_type == '') { // if (customer_type == '') {
layer.msg('请选择客户类型'); // layer.msg('请选择客户类型');
return false; // return false;
} // }
if (customer_type == 1) { // 若客户类型为终端，则外文名称，产品用途和网址为必填 // if (customer_type == 1) { // 若客户类型为终端，则外文名称，产品用途和网址为必填
if (!customer_en) { // if (!customer_en) {
layer.msg('请填写终端英文名称'); // layer.msg('请填写终端英文名称');
return false; // return false;
} // }
var en_reg = /^[a-zA-Z0-9\.\-\s\,\(\)]+$/; // var en_reg = /^[a-zA-Z0-9\.\-\s\,\(\)]+$/;
if(!en_reg.test(customer_en)){ // if(!en_reg.test(customer_en)){
layer.msg('请填写全英文名称'); // layer.msg('请填写全英文名称');
return false; // return false;
} // }
if (product_use_classone_sn == '') { // if (product_use_classone_sn == '') {
layer.msg('请选择产品用途一级分类'); // layer.msg('请选择产品用途一级分类');
return false; // return false;
} // }
if (!customer_website) { // if (!customer_website) {
layer.msg('请填写客户网址'); // layer.msg('请填写客户网址');
return false; // return false;
} // }
} // }
datax.customer_cn = customer_cn; // datax.customer_cn = customer_cn;
datax.customer_en = customer_en; // datax.customer_en = customer_en;
datax.customer_type = customer_type; // datax.customer_type = customer_type;
datax.product_use_classone_sn = product_use_classone_sn; // datax.product_use_classone_sn = product_use_classone_sn;
datax.product_use_classtwo_sn = product_use_classtwo_sn; // datax.product_use_classtwo_sn = product_use_classtwo_sn;
datax.customer_website = customer_website; // datax.customer_website = customer_website;
} // }
datax.tax_id = tax_id; datax.tax_id = tax_id;
datax.user_coupon_id = user_coupon_id; datax.user_coupon_id = user_coupon_id;
......
resources/views/addOrder/content.blade.php
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
.customer_type{ width: 30%; } .customer_type{ width: 30%; }
.product_use_classone_sn, .product_use_classtwo_sn{ float: left; width: 30%; } .product_use_classone_sn, .product_use_classtwo_sn{ float: left; width: 30%; }
</style> </style>
<div class="client-info form-horizontal"> <!-- <div class="client-info form-horizontal">
<h4>终端客户信息 <span class="title-tips"><i class="fa fa-info-circle"></i>digikey渠道商品必填，其他渠道可不填写</span></h4> <h4>终端客户信息 <span class="title-tips"><i class="fa fa-info-circle"></i>digikey渠道商品必填，其他渠道可不填写</span></h4>
<div class="row"> <div class="row">
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment