|
|
@@ -13,19 +13,19 @@ getCompany();
|
|
|
/*===============================TDS 城市加载 -- start -- =============================== */
|
|
|
$(function(){
|
|
|
|
|
|
- $("#province").ProvinceCity();
|
|
|
+ // $("#province").ProvinceCity();
|
|
|
$('.skin-minimal input').iCheck({
|
|
|
checkboxClass: 'icheckbox-blue',
|
|
|
radioClass: 'iradio-blue',
|
|
|
increaseArea: '20%'
|
|
|
});
|
|
|
- $("#arrcity").suggest(citys,{hot_list:commoncitys,dataContainer:'#arrcity_3word',onSelect:function(result){
|
|
|
- console.log($(this)[0].value);
|
|
|
- $("#city2").click()
|
|
|
- },
|
|
|
- attachObject:'#suggest'
|
|
|
- });
|
|
|
- $("#city2").suggest(citys,{hot_list:commoncitys,attachObject:"#suggest2"})
|
|
|
+ // $("#arrcity").suggest(citys,{hot_list:commoncitys,dataContainer:'#arrcity_3word',onSelect:function(result){
|
|
|
+ // console.log($(this)[0].value);
|
|
|
+ // $("#city2").click()
|
|
|
+ // },
|
|
|
+ // attachObject:'#suggest'
|
|
|
+ // });
|
|
|
+ // $("#city2").suggest(citys,{hot_list:commoncitys,attachObject:"#suggest2"})
|
|
|
});
|
|
|
/*===============================TDS 城市加载 -- start -- =============================== */
|
|
|
|
|
|
@@ -448,12 +448,12 @@ function initProcessResult(procMethodIsBack,procMethodIsSend){
|
|
|
setAddressInfo(); //修改页面才会调用
|
|
|
}else{
|
|
|
/* 在选择售后类型是，直接初始化省市区，使用isInitAddress 变量来判断 */
|
|
|
- if(isInitAddress == 0){
|
|
|
- var proId = setPro(null,2);
|
|
|
- var cityId = setCity(null,proId,2);
|
|
|
- setDistrict(null,cityId,2);
|
|
|
- isInitAddress = 1;
|
|
|
- }
|
|
|
+ // if(isInitAddress == 0){
|
|
|
+ // var proId = setPro(null,2);
|
|
|
+ // var cityId = setCity(null,proId,2);
|
|
|
+ // setDistrict(null,cityId,2);
|
|
|
+ // isInitAddress = 1;
|
|
|
+ // }
|
|
|
}
|
|
|
|
|
|
$("#salesChannelsSelect").show(); //展示销售公司
|
|
|
@@ -726,15 +726,6 @@ function sendPhone(type,node){
|
|
|
}else if(type == "m"){
|
|
|
phone = $("#m-phone").val();
|
|
|
questionId = complaint_questionId;
|
|
|
-
|
|
|
- //desc = UE.getEditor('sendAddressSms').getContent();
|
|
|
- //desc = $("#sendAddressSmsHtml").html(); //取值从html填写 -- 邮寄地址不用传过去，直接后台取
|
|
|
-
|
|
|
- // if(desc == null || desc == ""){
|
|
|
- // layer.close(index);
|
|
|
- // layer.msg("请填写邮寄信息内容！", {icon: 5, time: 3000});
|
|
|
- // return false;
|
|
|
- // }
|
|
|
}else{
|
|
|
layer.close(index);
|
|
|
layer.msg("发送报错！", {icon: 5, time: 3000});
|
|
|
@@ -944,7 +935,7 @@ function setSelectOrder(orderId){
|
|
|
$("#showSalesOrderId").html(html); //显示订单
|
|
|
|
|
|
$("#addressInfo").val(address);
|
|
|
- setAdress(); //显示地址
|
|
|
+ setAdress(address); //显示地址
|
|
|
setProduce(orderItemList); //显示产品
|
|
|
|
|
|
$("#companyId").val(companyId);
|
|
|
@@ -962,29 +953,40 @@ function setSelectOrder(orderId){
|
|
|
/**
|
|
|
* 设置地址
|
|
|
*/
|
|
|
-function setAdress(){
|
|
|
- var addres = $("#addressInfo").val();
|
|
|
-
|
|
|
+function setAdress(addres){
|
|
|
$("#addrssMsg").html("");
|
|
|
if(addres == null){
|
|
|
$("#addrssMsg").html("*未能获取到地址，请手动选择地址");
|
|
|
return;
|
|
|
}
|
|
|
var addresList = addres.split("-");
|
|
|
- if(addresList[0] == null || addresList[1]==null || addresList[2]==null || addresList[3]==null){
|
|
|
- $("#addrssMsg").html("*未能获取到地址，请手动选择地址");
|
|
|
- return;
|
|
|
- }
|
|
|
- var proId = setPro(getAddress(addresList[0],0),1);
|
|
|
- var cityId = setCity(getAddress(addresList[1],1),proId,1);
|
|
|
- setDistrict(getAddress(addresList[2],2),cityId,1);
|
|
|
- var sendAddress = addresList[3];
|
|
|
- if(addresList.length > 4){
|
|
|
- for(var k = 4;k< addresList.length;k++){
|
|
|
- sendAddress += addresList[k];
|
|
|
+ if(addresList == null || addresList.length < 3){
|
|
|
+ addresList = addres.split(" ");
|
|
|
+ if(addresList == null || addresList.length < 3){
|
|
|
+ addresList = addres.split("_");
|
|
|
+ if(addresList == null || addresList.length < 3){
|
|
|
+ addresList = addres.split("@");
|
|
|
+ if(addresList == null || addresList.length < 3){
|
|
|
+ $("#addrssMsg").html("*未能获取到地址，请手动选择地址:"+addres);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- $("#sendAddress").val(sendAddress);
|
|
|
+ ulcRelationAddress.setUlcByName(0,addresList[0],addresList[1],addresList[2]);
|
|
|
+ $("#sendAddress").val(addresList[3]);
|
|
|
+
|
|
|
+
|
|
|
+ // var proId = setPro(getAddress(addresList[0],0),1);
|
|
|
+ // var cityId = setCity(getAddress(addresList[1],1),proId,1);
|
|
|
+ // setDistrict(getAddress(addresList[2],2),cityId,1);
|
|
|
+ // var sendAddress = addresList[3];
|
|
|
+ // if(addresList.length > 4){
|
|
|
+ // for(var k = 4;k< addresList.length;k++){
|
|
|
+ // sendAddress += addresList[k];
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/***
|
|
|
@@ -1037,6 +1039,7 @@ function setPro(provinceName,type) {
|
|
|
}
|
|
|
if(province!=null){
|
|
|
var provinceHtml = ''
|
|
|
+ provinceHtml += '<option value="">请选择省份</option>';
|
|
|
for(var i=0;i<province.length;i++){
|
|
|
provinceHtml += '<option value="'+ province[i].provinceId +'">'+ province[i].province +'</option>';
|
|
|
}
|
|
|
@@ -1446,8 +1449,10 @@ function addCustomerReady(){
|
|
|
var province = $("#province").find("option:selected").text();
|
|
|
var city = $("#city").find("option:selected").text();
|
|
|
var district = $("#district").find("option:selected").text();
|
|
|
- var relationSendMergeAddress = province + "-" + city + "-" + district;
|
|
|
- $("#relationSendMergeAddress").val(relationSendMergeAddress);
|
|
|
+ if(district != null && district != "请选择区/县"){
|
|
|
+ var relationSendMergeAddress = province + "-" + city + "-" + district;
|
|
|
+ $("#relationSendMergeAddress").val(relationSendMergeAddress);
|
|
|
+ }
|
|
|
/* 地址拼接 */
|
|
|
|
|
|
/*----问题描述- start --*/
|
