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