diff --git a/erp_web/js/pages/materials/allocation_out_list.js b/erp_web/js/pages/materials/allocation_out_list.js index 213a8b27..c04f794a 100644 --- a/erp_web/js/pages/materials/allocation_out_list.js +++ b/erp_web/js/pages/materials/allocation_out_list.js @@ -697,13 +697,15 @@ function initTableData_material(type,TotalPrice){ } else { var unitName = res.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { ratio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); //给比例赋值 unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 body.find("[field='Unit']").find(input).prop("readonly","readonly"); //设置计量单位为只读 var loadRatio = 1; //在单位输入框上面加载比例字段 diff --git a/erp_web/js/pages/materials/assemble_list.js b/erp_web/js/pages/materials/assemble_list.js index 8a54e811..c1246dac 100644 --- a/erp_web/js/pages/materials/assemble_list.js +++ b/erp_web/js/pages/materials/assemble_list.js @@ -484,7 +484,6 @@ function findStockNumById(depotId, mId, monthTime, body, input, ratio, type){ thisRatio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); unitName = unitName.substring(0, unitName.indexOf("(")); } - var unitArr = unitName.split(","); } //查询库存 $.ajax({ @@ -696,13 +695,15 @@ function initTableData_material(type,TotalPrice){ } else { var unitName = res.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { ratio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); //给比例赋值 unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 body.find("[field='Unit']").find(input).prop("readonly","readonly"); //设置计量单位为只读 var loadRatio = 1; //在单位输入框上面加载比例字段 diff --git a/erp_web/js/pages/materials/disassemble_list.js b/erp_web/js/pages/materials/disassemble_list.js index f2235d0c..82d5e923 100644 --- a/erp_web/js/pages/materials/disassemble_list.js +++ b/erp_web/js/pages/materials/disassemble_list.js @@ -483,7 +483,6 @@ function findStockNumById(depotId, mId, monthTime, body, input, ratio, type){ thisRatio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); unitName = unitName.substring(0, unitName.indexOf("(")); } - var unitArr = unitName.split(","); } //查询库存 $.ajax({ @@ -695,13 +694,15 @@ function initTableData_material(type,TotalPrice){ } else { var unitName = res.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { ratio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); //给比例赋值 unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 body.find("[field='Unit']").find(input).prop("readonly","readonly"); //设置计量单位为只读 var loadRatio = 1; //在单位输入框上面加载比例字段 diff --git a/erp_web/js/pages/materials/other_in_list.js b/erp_web/js/pages/materials/other_in_list.js index 26643f76..32ed022c 100644 --- a/erp_web/js/pages/materials/other_in_list.js +++ b/erp_web/js/pages/materials/other_in_list.js @@ -700,13 +700,15 @@ function initTableData_material(type,TotalPrice){ } else { var unitName = res.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { ratio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); //给比例赋值 unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 body.find("[field='Unit']").find(input).prop("readonly","readonly"); //设置计量单位为只读 var loadRatio = 1; //在单位输入框上面加载比例字段 diff --git a/erp_web/js/pages/materials/other_out_list.js b/erp_web/js/pages/materials/other_out_list.js index 964f2ac0..c60fa244 100644 --- a/erp_web/js/pages/materials/other_out_list.js +++ b/erp_web/js/pages/materials/other_out_list.js @@ -694,13 +694,15 @@ function initTableData_material(type,TotalPrice){ } else { var unitName = res.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { ratio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); //给比例赋值 unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 body.find("[field='Unit']").find(input).prop("readonly","readonly"); //设置计量单位为只读 var loadRatio = 1; //在单位输入框上面加载比例字段 diff --git a/erp_web/js/pages/materials/purchase_back_list.js b/erp_web/js/pages/materials/purchase_back_list.js index 5104f489..c515c8e3 100644 --- a/erp_web/js/pages/materials/purchase_back_list.js +++ b/erp_web/js/pages/materials/purchase_back_list.js @@ -476,13 +476,15 @@ function findStockNumById(depotId, mId, monthTime, body, input, ratio, type){ } else{ var unitName = rec.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { thisRatio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 unitSetInput = rec.data[0].firstinunit; if(basicUnit==unitSetInput){ //基础单位等于选择的单位 @@ -702,13 +704,15 @@ function initTableData_material(type,TotalPrice){ } else { var unitName = res.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { ratio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); //给比例赋值 unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 body.find("[field='Unit']").find(input).prop("readonly","readonly"); //设置计量单位为只读 var loadRatio = 1; //在单位输入框上面加载比例字段 diff --git a/erp_web/js/pages/materials/purchase_in_list.js b/erp_web/js/pages/materials/purchase_in_list.js index cacac4e1..9d3b96bd 100644 --- a/erp_web/js/pages/materials/purchase_in_list.js +++ b/erp_web/js/pages/materials/purchase_in_list.js @@ -479,13 +479,15 @@ function findStockNumById(depotId, mId, monthTime, body, input, ratio, type){ } else{ var unitName = rec.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { thisRatio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 unitSetInput = rec.data[0].firstinunit; if(basicUnit==unitSetInput){ //基础单位等于选择的单位 @@ -705,13 +707,15 @@ function initTableData_material(type,TotalPrice){ } else { var unitName = res.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { ratio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); //给比例赋值 unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 body.find("[field='Unit']").find(input).prop("readonly","readonly"); //设置计量单位为只读 var loadRatio = 1; //在单位输入框上面加载比例字段 diff --git a/erp_web/js/pages/materials/purchase_orders_list.js b/erp_web/js/pages/materials/purchase_orders_list.js index a3ece096..a2941c7d 100644 --- a/erp_web/js/pages/materials/purchase_orders_list.js +++ b/erp_web/js/pages/materials/purchase_orders_list.js @@ -481,13 +481,15 @@ function findStockNumById(depotId, mId, monthTime, body, input, ratio, type){ } else{ var unitName = rec.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { thisRatio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 unitSetInput = rec.data[0].firstinunit; if(basicUnit==unitSetInput){ //基础单位等于选择的单位 @@ -707,13 +709,15 @@ function initTableData_material(type,TotalPrice){ } else { var unitName = res.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { ratio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); //给比例赋值 unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 body.find("[field='Unit']").find(input).prop("readonly","readonly"); //设置计量单位为只读 var loadRatio = 1; //在单位输入框上面加载比例字段 diff --git a/erp_web/js/pages/materials/retail_back_list.js b/erp_web/js/pages/materials/retail_back_list.js index 979b932c..6c05c1e9 100644 --- a/erp_web/js/pages/materials/retail_back_list.js +++ b/erp_web/js/pages/materials/retail_back_list.js @@ -480,13 +480,15 @@ function findStockNumById(depotId, mId, monthTime, body, input, ratio, type){ } else{ var unitName = rec.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { thisRatio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 unitSetInput = rec.data[0].firstoutunit; if(basicUnit==unitSetInput){ //基础单位等于选择的单位 @@ -708,13 +710,15 @@ function initTableData_material(type,TotalPrice){ } else { var unitName = res.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { ratio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); //给比例赋值 unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 body.find("[field='Unit']").find(input).prop("readonly","readonly"); //设置计量单位为只读 var loadRatio = 1; //在单位输入框上面加载比例字段 diff --git a/erp_web/js/pages/materials/retail_out_list.js b/erp_web/js/pages/materials/retail_out_list.js index 871706d8..93601cc5 100644 --- a/erp_web/js/pages/materials/retail_out_list.js +++ b/erp_web/js/pages/materials/retail_out_list.js @@ -472,13 +472,15 @@ function findStockNumById(depotId, mId, monthTime, body, input, ratio, type){ } else{ var unitName = rec.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { thisRatio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 unitSetInput = rec.data[0].firstoutunit; if(basicUnit==unitSetInput){ //基础单位等于选择的单位 @@ -700,13 +702,15 @@ function initTableData_material(type,TotalPrice){ } else { var unitName = res.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { ratio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); //给比例赋值 unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 body.find("[field='Unit']").find(input).prop("readonly","readonly"); //设置计量单位为只读 var loadRatio = 1; //在单位输入框上面加载比例字段 diff --git a/erp_web/js/pages/materials/sale_back_list.js b/erp_web/js/pages/materials/sale_back_list.js index 17b9bb58..8fa22af3 100644 --- a/erp_web/js/pages/materials/sale_back_list.js +++ b/erp_web/js/pages/materials/sale_back_list.js @@ -481,13 +481,16 @@ function findStockNumById(depotId, mId, monthTime, body, input, ratio, type){ } else{ var unitName = rec.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { thisRatio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); unitName = unitName.substring(0, unitName.indexOf("(")); + unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 + var unitSetInput =""; //单位 unitSetInput = rec.data[0].firstoutunit; if(basicUnit==unitSetInput){ //基础单位等于选择的单位 @@ -706,13 +709,16 @@ function initTableData_material(type,TotalPrice){ } else { var unitName = res.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { ratio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); //给比例赋值 unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 + var unitSetInput =""; //单位 body.find("[field='Unit']").find(input).prop("readonly","readonly"); //设置计量单位为只读 var loadRatio = 1; //在单位输入框上面加载比例字段 diff --git a/erp_web/js/pages/materials/sale_orders_list.js b/erp_web/js/pages/materials/sale_orders_list.js index fb6b72f9..760459a8 100644 --- a/erp_web/js/pages/materials/sale_orders_list.js +++ b/erp_web/js/pages/materials/sale_orders_list.js @@ -481,13 +481,15 @@ function findStockNumById(depotId, mId, monthTime, body, input, ratio, type){ } else{ var unitName = rec.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { thisRatio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 unitSetInput = rec.data[0].firstoutunit; if(basicUnit==unitSetInput){ //基础单位等于选择的单位 @@ -707,13 +709,15 @@ function initTableData_material(type,TotalPrice){ } else { var unitName = res.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { ratio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); //给比例赋值 unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 body.find("[field='Unit']").find(input).prop("readonly","readonly"); //设置计量单位为只读 var loadRatio = 1; //在单位输入框上面加载比例字段 diff --git a/erp_web/js/pages/materials/sale_out_list.js b/erp_web/js/pages/materials/sale_out_list.js index 3497c7e4..f2f977e9 100644 --- a/erp_web/js/pages/materials/sale_out_list.js +++ b/erp_web/js/pages/materials/sale_out_list.js @@ -479,13 +479,15 @@ function findStockNumById(depotId, mId, monthTime, body, input, ratio, type){ } else{ var unitName = rec.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { thisRatio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 unitSetInput = rec.data[0].firstoutunit; if(basicUnit==unitSetInput){ //基础单位等于选择的单位 @@ -705,13 +707,15 @@ function initTableData_material(type,TotalPrice){ } else { var unitName = res.data[0].unitName; + var basicUnit=""; + var otherUnit=""; if(unitName) { ratio = unitName.substring(unitName.indexOf(":")+1).replace(")",""); //给比例赋值 unitName = unitName.substring(0, unitName.indexOf("(")); + var unitArr = unitName.split(","); + basicUnit = unitArr[0]; //基础单位 + otherUnit = unitArr[1]; //副单位 } - var unitArr = unitName.split(","); - var basicUnit = unitArr[0]; //基础单位 - var otherUnit = unitArr[1]; //副单位 var unitSetInput =""; //单位 body.find("[field='Unit']").find(input).prop("readonly","readonly"); //设置计量单位为只读 var loadRatio = 1; //在单位输入框上面加载比例字段