From 53fc59992c6aead62d8918ba4f611e38c6036b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 29 Sep 2017 23:04:30 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=A0=B9=E6=8D=AE=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=A5=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=8A=B6=E6=80=81"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3d011e89487c9f5eeffc3511b92585afa9c0b420.
---
 src/main/webapp/js/pages/materials/in_out.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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