供应商在申请人阶段填写全部信息

topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.js

@@ -10,7 +10,6 @@ $(document).ready(function () {
     loadSuppliersBuyerListGrid();
     loadSuppliersBankListGrid();
     bindEvent();
-    controlCashierGrid();
 });
 function initialize(){
     UICtrl.layout("#layout", {leftWidth: 3});
@@ -592,21 +591,19 @@ function checkConstraints(){
             return false;
         }
     }
-    if ("cashier" == getSubProcUnitId() || "finance" == getSubProcUnitId()){
-        //付款信息
-        var pay_grid = UICtrl.getGridManager('#sapSuppliersPayGrid');
-        if (pay_grid) {
-            var datas = DataUtil.getGridData({
-                gridManager: pay_grid,
-                isAllData: true
-            });
-            if (!datas) {
-                return false;
-            }
-            if (isApproveProcUnit() && datas.length == 0 && "2" != getHandleResult()){
-                Public.tip("供应商付款信息必填");
-                return false;
-            }
+    //付款信息
+    var pay_grid = UICtrl.getGridManager('#sapSuppliersPayGrid');
+    if (pay_grid) {
+        var datas = DataUtil.getGridData({
+            gridManager: pay_grid,
+            isAllData: true
+        });
+        if (!datas) {
+            return false;
+        }
+        if (isApproveProcUnit() && datas.length == 0 && "2" != getHandleResult()){
+            Public.tip("供应商付款信息必填");
+            return false;
         }
     }
     return true;
@@ -667,18 +664,4 @@ function reloadGrid() {
     sapSuppliersPayGridManager.loadData();
     sapSuppliersBuyerGridManager.loadData();
     sapSuppliersBankGridManager.loadData();
-}
-
-function controlCashierGrid(){
-    var status = $("#statusId").val();
-    if (status == 0 || status == 1){
-        $("#cashierGrid").hide();
-    }
-    let subProcUnitId = getSubProcUnitId();
-    if ("cashier" == subProcUnitId){
-        $("#cashierGrid").show();
-    }
-    if ("finance" == subProcUnitId){
-        $("#cashierGrid").show();
-    }
 }
\ No newline at end of file

topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.jsp

@@ -98,14 +98,12 @@
     <div class="blank_div clearfix"></div>
     <x:title title="供应商采购组织信息" name="group"/>
     <div id="sapSuppliersBuyerGrid" style="margin: 2px;"></div>
-    <div id="cashierGrid">
-        <div class="blank_div clearfix"></div>
-        <x:title title="供应商公司信息" name="group"/>
-        <div id="sapSuppliersPayGrid" style="margin: 2px;"></div>
-        <div class="blank_div clearfix"></div>
-        <x:title title="供应商银行银行信息" name="group"/>
-        <div id="sapSuppliersBankGrid" style="margin: 2px;"></div>
-    </div>
+    <div class="blank_div clearfix"></div>
+    <x:title title="供应商公司信息" name="group"/>
+    <div id="sapSuppliersPayGrid" style="margin: 2px;"></div>
+    <div class="blank_div clearfix"></div>
+    <x:title title="供应商银行银行信息" name="group"/>
+    <div id="sapSuppliersBankGrid" style="margin: 2px;"></div>
 </form>
 </body>
 </html>

topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersExtendDataDetail.js

@@ -608,20 +608,6 @@ function reloadGrid() {
     sapSuppliersBankGridManager.loadData();
 }
 
-function controlCashierGrid(){
-    var status = $("#statusId").val();
-    if (status == 0 || status == 1){
-        $("#cashierGrid").hide();
-    }
-    let subProcUnitId = getSubProcUnitId();
-    if ("cashier" == subProcUnitId){
-        $("#cashierGrid").show();
-    }
-    if ("finance" == subProcUnitId){
-        $("#cashierGrid").show();
-    }
-}
-
 function initNowData(){
     var partner = $("#partner").val();
     Public.ajax(web_app.name+"/sapSuppliersData/getSupplierNowItemList.ajax",{partner:partner},function (data){

topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersExtendDataDetail.jsp

@@ -88,13 +88,14 @@
         <x:fileList bizCode="supplier" bizId="attbizId" id="supplierList" title="营业执照/开票资料" />
     </div>
     <div class="blank_div clearfix"></div>
+    <x:title title="供应商采购组织信息" name="group"/>
     <div id="sapSuppliersBuyerGrid" style="margin: 2px;"></div>
-    <div id="cashierGrid">
-        <div class="blank_div clearfix"></div>
-        <div id="sapSuppliersPayGrid" style="margin: 2px;"></div>
-        <div class="blank_div clearfix"></div>
-        <div id="sapSuppliersBankGrid" style="margin: 2px;"></div>
-    </div>
+    <div class="blank_div clearfix"></div>
+    <x:title title="供应商公司信息" name="group"/>
+    <div id="sapSuppliersPayGrid" style="margin: 2px;"></div>
+    <div class="blank_div clearfix"></div>
+    <x:title title="供应商银行银行信息" name="group"/>
+    <div id="sapSuppliersBankGrid" style="margin: 2px;"></div>
 </form>
 </body>
 </html>