purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复出入库操作未处理空的问题

Browse Source
This commit is contained in:
qiankunpingtai
2019-05-13 11:02:00 +08:00
parent ccd97ea07d
commit d2dedaf77a
13 changed files with 107 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erp_web/js/pages/materials/allocation_out_list.js
View File

@@ -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; //在单位输入框上面加载比例字段

9
erp_web/js/pages/materials/assemble_list.js
View File

@@ -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; //在单位输入框上面加载比例字段

9
erp_web/js/pages/materials/disassemble_list.js
View File

@@ -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; //在单位输入框上面加载比例字段

8
erp_web/js/pages/materials/other_in_list.js
View File

@@ -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; //在单位输入框上面加载比例字段

8
erp_web/js/pages/materials/other_out_list.js
View File

@@ -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; //在单位输入框上面加载比例字段

16
erp_web/js/pages/materials/purchase_back_list.js
View File

@@ -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; //在单位输入框上面加载比例字段

16
erp_web/js/pages/materials/purchase_in_list.js
View File

@@ -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; //在单位输入框上面加载比例字段

16
erp_web/js/pages/materials/purchase_orders_list.js
View File

@@ -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; //在单位输入框上面加载比例字段

16
erp_web/js/pages/materials/retail_back_list.js
View File

@@ -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; //在单位输入框上面加载比例字段

16
erp_web/js/pages/materials/retail_out_list.js
View File

@@ -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; //在单位输入框上面加载比例字段

18
erp_web/js/pages/materials/sale_back_list.js
View File

@@ -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; //在单位输入框上面加载比例字段

16
erp_web/js/pages/materials/sale_orders_list.js
View File

@@ -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; //在单位输入框上面加载比例字段

16
erp_web/js/pages/materials/sale_out_list.js
View File

@@ -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; //在单位输入框上面加载比例字段