付款申请(无PO)修改BUG

topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.js

@@ -567,7 +567,7 @@ function loadGrid(obj) {
         toolbarOptions = UICtrl.getDefaultToolbarOptions({
             addHandler: function () {
                 tableArray.forEach((item) => {
-                    UICtrl.addGridRow(item.gridManager, {zepItemno: getZepItemNo(),waers: 'CNY', kursf: 1.00});
+                    UICtrl.addGridRow(item.gridManager, {zepItemno: getZepItemNo(),zepBptype:"E",zepBptypename:"员工客户",waers: 'CNY', kursf: 1.00});
                 });
             },
             deleteHandler: function () {

topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursementList.js

@@ -30,6 +30,7 @@ function loadGrid() {
             {display: "EP流程单号", name: "zepNo", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "付款申请内容", name: "zepTxt", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "填报日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "状态", name: "statusTextView", width: "80", align: "left", type: "string"}
 
         ],
         dataAction: "server",

topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyNoPO.js

@@ -36,8 +36,8 @@ var tableArray = [
             },
             {
 
-                display: "BP标识", name: "zepBptype", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
+                display: "BP标识", name: "zepBptype", width: 80, minwidth: 60, type: "string", align: "left"
+               /* ,editor: {
                     required: false, type: "select",
                     data: {
                         type: 'system',
@@ -50,13 +50,13 @@ var tableArray = [
                             ZEP_BPTYPENAME: "zepBptypename"
                         }
                     },
-                }
+                }*/
             },
             {
-                display: "BP标识描述", name: "zepBptypename", width: 120, minwidth: 120, type: "string", align: "left",
-                editor: {
+                display: "BP标识描述", name: "zepBptypename", width: 100, minwidth: 80, type: "string", align: "left"
+                /*,editor: {
                     type: 'text'
-                }
+                }*/
             },
             {
                 display: "BP(合作伙伴)", name: "partner", width: 120, minwidth: 120, type: "string", align: "left",
@@ -567,7 +567,7 @@ function loadGrid(obj) {
         toolbarOptions = UICtrl.getDefaultToolbarOptions({
             addHandler: function () {
                 tableArray.forEach((item) => {
-                    UICtrl.addGridRow(item.gridManager, {zepItemno: getZepItemNo(),waers: 'CNY', kursf: 1.00});
+                    UICtrl.addGridRow(item.gridManager, {zepItemno: getZepItemNo(),zepBptype:"K",zepBptypename:"供应商",waers: 'CNY', kursf: 1.00});
                 });
             },
             deleteHandler: function () {

topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyNoPO.jsp

@@ -42,7 +42,7 @@
             <div class="hg-form-row">
                 <x:inputC name="zepAppliname" required="false" readonly="true" label="EP流程申请人" labelCol="2" fieldCol="2"/>
                 <x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="2"/>
-                <x:inputC name="employeeLoanBillCode" required="false" label="员工借款编号" labelCol="2" fieldCol="2" wrapper="select"/>
+                <!--x:inputC name="employeeLoanBillCode" required="false" label="员工借款编号" labelCol="2" fieldCol="2" wrapper="select" /-->
             </div>
             <div id="capitalPost">
                 <div class="hg-form-row">

topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyNoPOList.js

@@ -12,7 +12,7 @@ function initializateUI() {
 function loadGrid() {
 
     var toolbarOptions = UICtrl.getDefaultToolbarOptions({
-        addCostReimbursement: {id:'costReimbursement',img:'fa-cog',text:'添加付款申请(无)',click:function(){
+        addCostReimbursement: {id:'costReimbursement',img:'fa-cog',text:'添加付款申请(无PO)',click:function(){
                 addCostReimbursement();
             }},
     });
@@ -34,7 +34,7 @@ function loadGrid() {
         ],
         dataAction: "server",
         url: web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementList.ajax',
-        parms:{zepFtype:"N"},
+        parms:{zepFtype:"H"},
         pageSize: 20,
         usePager: true,
         toolbar: toolbarOptions,
@@ -133,7 +133,7 @@ function doView(id,zepFtype) {
     if (zepFtype=="E"){
         title="客户退款申请详情";
     }
-    if (zepFtype=="N"){
+    if (zepFtype=="H"){
         title="付款申请(无PO)详情";
     }
     if (zepFtype=="B"){

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.js

@@ -11,7 +11,17 @@ function initialize(){
  //   if (isDetailPage) {
    //     $("#jobPageTop").hide();
  //   }
-
+    if ($("#isReadOnly").val()=="true") {
+         disableForm("infoRecord","disable");
+    } else {
+         var readwriteList = UICtrl.getUIElementPermissions(UIPO.READWRITE, UIPK.DETAIL);
+        if (($("#statusId").val() == 1 && readwriteList.length > 0)) {
+             disableForm("infoRecord", "disable");
+            $.each(readwriteList, function (i, o) {
+                $("#" + o).removeAttr('disabled');
+            });
+        }
+    }
 }
 
 /**

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.jsp

@@ -13,6 +13,7 @@
         <div class="hg-form-row">
             <x:hidden name="id"/>
             <x:hidden name="rowId"/>
+            <x:hidden name="isReadOnly"/>
             <x:inputC name="infnr" label="信息记录编号" labelCol="1" fieldCol="2" required="false" readonly="false"/>
             <x:hidden name="werks"/>
             <x:inputC name="werksName" required="true" label="工厂" labelCol="1" wrapper="select" fieldCol="2"/>

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js

@@ -29,7 +29,7 @@ function initItemGrid() {
             });
         },
         deleteHandler: function (){
-         debugger
+        // debugger
             var row = DataUtil.getSelectedRow(itemGridManager);
             for  (var r=0;r<row.length;r++) {
                 if (itemGridManager.rows[u].id=="undefined")  {
@@ -687,10 +687,11 @@ function  viewHandler(data){
      //debugger
     var param = JSON.stringify(data);
     var rowId=data.__id;
-    if ($("#isReadOnly").val()=="true"||$("#statusId").val()!=0) {
+    var readwriteList = UICtrl.getUIElementPermissions(UIPO.READWRITE, UIPK.DETAIL);
+    if ($("#isReadOnly").val()=="true"||($("#statusId").val()==1&&readwriteList.length==0)) {
       UICtrl.showAjaxDialog({
-        title: "添加采购信息记录",
-        url: web_app.name + '/sapPurchaseInfoRecord/addSapPurchaseInfoRecordDetail.load?id=' + data.id + '&rowId=' + rowId,
+        title: "查看采购信息记录",
+        url: web_app.name + '/sapPurchaseInfoRecord/addSapPurchaseInfoRecordDetail.load?id=' + data.id + '&rowId=' + rowId+'&isReadOnly=true',
         param: {
             param
         },

topsun-xt/src/main/webapp/biz/topsun/sap/transfers/sapStockTransfersDetail.js

@@ -137,7 +137,7 @@ function loadGrid() {
             },
             {display: "物料名称", name: "matnrName", width: "200", align: "left", type: "string"},
             {display: "数量", name: "menge", width: 120, minWidth: 60, type: "string", align: "left",
-                editor: {  type: "text",mask: 'nnnn',required: true }
+                editor: {  type: "text",mask: 'nnnnnn',required: true }
             },
             { display: "单位", name: "meinsName", width: 120, minWidth: 60, type: "string", align: "left",
                 editor: {

topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/application/impl/SapCostReimbursementApplicationImpl.java

@@ -4,8 +4,10 @@ package com.huigou.topsun.sap.costReimbursement.application.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.huigou.cache.DictUtil;
 import com.huigou.data.domain.model.CommonDomainConstants;
 import com.huigou.data.query.model.QueryDescriptor;
+import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.sap.common.DefaultHttpClient;
 import com.huigou.topsun.sap.common.domain.SapResult;
 import com.huigou.topsun.sap.costReimbursement.application.SapCostReimbursementApplication;
@@ -145,7 +147,7 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
     }
 
     @Transactional
-    private void updateStatus(String bizId, BizBillStatus status) {
+    protected void updateStatus(String bizId, BizBillStatus status) {
         Assert.hasText(bizId, CommonDomainConstants.ID_NOT_BLANK);
         this.commonDomainService.updateStatus(SapCostReimbursement.class, bizId, status.getId());
     }
@@ -198,7 +200,11 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
     @Override
     public Map<String, Object> slicedSapCostReimbursementQuery(SapCostReimbursementQueryRequest query) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedSapCostReimbursementQuery");
-        return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor, query);
+        QueryModel model = this.sqlExecutorDao.getQueryModel(queryDescriptor, query);
+        model.putDictionary("status", DictUtil.getDictionary("bizBillStatus"));
+        model.addCriteria(" order by bill_code desc ");
+       // return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor, query);
+        return this.sqlExecutorDao.executeSlicedQuery(model);
     }
 
 

topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/controller/SapCostReimbursementController.java

@@ -84,7 +84,7 @@ public class SapCostReimbursementController extends CommonController {
                 sapCostReimbursement.setZepFtypename("费用报销流程");
                 return forward("costReimbursement",sapCostReimbursement);
             case "payNoPo":
-                sapCostReimbursement.setZepFtype("N");
+                sapCostReimbursement.setZepFtype("H");
                 sapCostReimbursement.setZepFtypename("付款申请(无PO)流程");
                 return forward("payApplyNoPO",sapCostReimbursement);
             case "borrow":
@@ -142,7 +142,7 @@ public class SapCostReimbursementController extends CommonController {
         switch (zepFtype) {
             case "A":
                 return forward("costReimbursement",sapCostReimbursement);
-            case "N":
+            case "H":
                 return forward("payApplyNoPO",sapCostReimbursement);
             case "B":
                 return forward("employeeLoan",sapCostReimbursement);

topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/controller/SapPurchaseInfoRecordController.java

@@ -73,11 +73,6 @@ public class SapPurchaseInfoRecordController extends CommonController {
         //String edit=sdo.getString("edit");
         String rowId=sdo.getString("rowId");
         SapPurchaseInfoRecordItem item = (SapPurchaseInfoRecordItem) com.alibaba.fastjson.JSONObject.parseObject(sdo.getString("param"), SapPurchaseInfoRecordItem.class);
-        if (StringUtil.isNotBlank(id)&&id.length()>30){ //编辑明细
-        //    item=this.sapPurchaseInfoRecordItemRepository.findOne(id);
-        } else {
-          //  item = (SapPurchaseInfoRecordItem) com.alibaba.fastjson.JSONObject.parseObject(sdo.getString("param"), SapPurchaseInfoRecordItem.class);
-        }
         if (item!=null){
             item.setRowId(rowId);
             if (id.equals(rowId)){
@@ -86,6 +81,7 @@ public class SapPurchaseInfoRecordController extends CommonController {
                 item.setId(id);
             }
         }
+        this.putAttribute("isReadOnly",sdo.getString("isReadOnly"));
        // SapPurchaseInfoRecord sapPurchaseInfoRecord = sapPurchaseInfoRecordApplication.loadSapPurchaseInfoRecord(id);
         return forward("addPurchaseInfoRecordDetail",item);
     }
@@ -103,6 +99,10 @@ public class SapPurchaseInfoRecordController extends CommonController {
         String id = sdo.getBizId();
         SapPurchaseInfoRecord sapPurchaseInfoRecord = sapPurchaseInfoRecordApplication.loadSapPurchaseInfoRecord(id);
         this.putAttribute("isReadOnly",sdo.getString("isReadOnly"));
+        if (sapPurchaseInfoRecord!=null&&(BizBillStatus.COMPLETED.getId()==sapPurchaseInfoRecord.getStatusId()||
+                BizBillStatus.ABORTED.getId()==sapPurchaseInfoRecord.getStatusId())){
+            this.putAttribute("isReadOnly","true");
+        }
         return forward("purchaseInfoRecordDetail",sapPurchaseInfoRecord);
     }