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

Revert "根据审核按钮来判断是否显示状态"

Browse Source 
This reverts commit 3d011e8948.
This commit is contained in:
季圣华
2017-09-29 23:04:30 +08:00
parent 3d011e8948
commit 53fc59992c
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/webapp/js/pages/materials/in_out.js
View File

@@ -445,7 +445,6 @@
//初始化表格数据 //初始化表格数据
function initTableData(){ function initTableData(){
var hideType = undefined; var hideType = undefined;
var isHiddenStatus = true;
if(payTypeTitle === "隐藏"){ if(payTypeTitle === "隐藏"){
hideType = true; //隐藏当前列 hideType = true; //隐藏当前列
} }
@@ -471,7 +470,6 @@
]; ];
//如果允许的按钮列表中存在就显示，3-代表审核|反审核的权限 //如果允许的按钮列表中存在就显示，3-代表审核|反审核的权限
if(btnEnableList && btnEnableList.indexOf(3)>-1){ if(btnEnableList && btnEnableList.indexOf(3)>-1){
isHiddenStatus = false; //显示
tableToolBar.push({ tableToolBar.push({
id:'okDepotHead', id:'okDepotHead',
text:'审核', text:'审核',
@@ -489,9 +487,6 @@
} }
}); });
} }
else {
isHiddenStatus = true; //隐藏
}
var isShowLastMoneyColumn = false; //是否显示优惠后金额和价税合计,true为隐藏,false为显示 var isShowLastMoneyColumn = false; //是否显示优惠后金额和价税合计,true为隐藏,false为显示
if(listSubType == "调拨" || listSubType == "其它" || listSubType == "零售" || listSubType == "零售退货" || listSubType == "礼品充值" || listSubType == "礼品销售" || listSubType == "组装单" || listSubType == "拆卸单"){ if(listSubType == "调拨" || listSubType == "其它" || listSubType == "零售" || listSubType == "零售退货" || listSubType == "礼品充值" || listSubType == "礼品销售" || listSubType == "组装单" || listSubType == "拆卸单"){
isShowLastMoneyColumn = true; //隐藏 isShowLastMoneyColumn = true; //隐藏
@@ -564,7 +559,7 @@
}, },
{ title: '优惠后金额',field: 'DiscountLastMoney',hidden:isShowLastMoneyColumn,width:80}, { title: '优惠后金额',field: 'DiscountLastMoney',hidden:isShowLastMoneyColumn,width:80},
{ title: payTypeTitle,field: 'ChangeAmount',width:50,hidden:hideType}, { title: payTypeTitle,field: 'ChangeAmount',width:50,hidden:hideType},
{ title: '状态',field: 'Status',hidden:isHiddenStatus, width:70,align:"center",formatter:function(value){ { title: '状态',field: 'Status',width:70,align:"center",formatter:function(value){
return value? "<span style='color:green;'>已审核</span>":"<span style='color:red;'>未审核</span>"; return value? "<span style='color:green;'>已审核</span>":"<span style='color:red;'>未审核</span>";
} }
} }