Skip to content

朱继来 / 后台订单管理

Go to a project
Commit ea1ddf3a by 朱继来
Options

后台下单、审单digikey终端信息更改为选填

parent 71d54bda
Inline Side-by-side
Showing with 49 additions and 55 deletions
public/js/add_order.js
...@@ -730,37 +730,31 @@ ...@@ -730,37 +730,31 @@
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();
if (!customer_cn) { // if (!customer_cn) {
layer.msg('请填写终端中文名称'); // layer.msg('请填写终端中文名称');
return false;
}
// var cn_reg = /^[\u4e00-\u9fa5]+$/;
// if(!cn_reg.test(customer_cn)){
// layer.msg('请填写全中文名称');
// return false; // return false;
// } // }
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 (customer_type == '') { // if (customer_type == '') {
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;
} // }
datax.customer_cn = customer_cn; datax.customer_cn = customer_cn;
datax.customer_en = customer_en; datax.customer_en = customer_en;
......
public/js/change_order.js
...@@ -377,39 +377,39 @@ ...@@ -377,39 +377,39 @@
var business_type = $('input[name=business_type]').val(); var business_type = $('input[name=business_type]').val();
// 若存在digikey商品，终端客户信息必填 2020-4-26 // 若存在digikey商品，终端客户信息必填 2020-4-26
if (is_dgk_exists) { // if (is_dgk_exists) {
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();
if (!customer_cn) { // if (!customer_cn) {
layer.msg('请填写终端中文名称'); // layer.msg('请填写终端中文名称');
return false; // return false;
} // }
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 (customer_type == '') { // if (customer_type == '') {
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 (isNewClient) { if (isNewClient) {
if (client_source == null) { if (client_source == null) {
......
resources/views/detail/detail_multi_info.php
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
<tr> <tr>
<td><?= $order_extra['customer_cn'] ?></td> <td><?= $order_extra['customer_cn'] ?></td>
<td><?= $order_extra['customer_en'] ?></td> <td><?= $order_extra['customer_en'] ?></td>
<td><?= Config('params.end_user_type')[$order_extra['customer_type']] ?></td> <td><?= $order_extra['customer_type'] ? Config('params.end_user_type')[$order_extra['customer_type']] : '' ?></td>
<td><?= $order_extra['product_use'] ?></td> <td><?= $order_extra['product_use'] ?></td>
</tr> </tr>
</table> </table>
......
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