Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -148,7 +148,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         String pi_inoutno = main.getPi_inoutno();
         String pi_class = main.getPi_class();
         ProdInOut prodInOut = BeanMapper.map(main,ProdInOut.class);
-
         //编号获取
         DocBaseDTO baseDTO = new DocBaseDTO();
         baseDTO.setCode(pi_inoutno);
@@ -156,17 +155,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         baseDTO.setName(pi_class);
         pi_inoutno = pushMaxnubmer(baseDTO);
         prodInOut.setPi_inoutno(pi_inoutno);
-
-
-        if ("采购验收单".equals(pi_class)){
-            prodInOut.setPi_prstatus(Status.PAYNONE.getDisplay());
-            prodInOut.setPi_prstatuscode(Status.PAYNONE.name());
-        }else if ("采购验退单".equals(pi_class)){
-            prodInOut.setPi_prstatus(Status.RECNONE.getDisplay());
-            prodInOut.setPi_prstatuscode(Status.RECNONE.name());
-        }
-
-
+        prodInOut.setPi_prstatus(Status.PAYNONE.getDisplay());
+        prodInOut.setPi_prstatuscode(Status.PAYNONE.name());
         //判断更新与保存动作
         if (StringUtils.isEmpty(pi_id) || "0".equals(pi_id.toString())){
             prodInOut.setCompanyId(companyId);

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -555,6 +555,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         //setUpdateInfo(purchase);
         //更新存在字段
         purchaseMapper.updateByPrimaryKeySelective(purchase);
+        commonService.commonResAudit("purchase", "pu_id=" + id, "pu_status",
+                "pu_statuscode", "pu_auditdate", "pu_auditman");
         DocBaseDTO docBaseDTO = getBaseDTOById(id);
         //日志
         messageLogService.unAudit(docBaseDTO);

frontend/saas-web/app/Application.scss

@@ -54,9 +54,9 @@ body.launching {
   z-index: 0 !important;
 }
 
-.x-css-shadow {
-  box-shadow: none !important;
-}
+// .x-css-shadow {
+//   box-shadow: none !important;
+// }
 
 .shadow {
   @include box-shadow(rgba(0, 0, 0, 0.2) 0 1px 2px);

frontend/saas-web/app/view/core/dbfind/types/WarehouseDbfindTrigger.js

@@ -117,8 +117,7 @@ Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
                 reqUrl: '/api/document/warehouse/save',
                 delUrl: '/api/document/warehouse/delete'
             },
-            // _parent:this.getView(),
-            // record:record,
+            caller:'WareHouse',
             session: true
         });
         this.dialog.show();

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -34,7 +34,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
               if(codeField){
                 w.setLoading(true);
                 //取后台编号
-                var caller = w._parent.caller;
+                var caller = w.caller || w._parent.caller;
                 saas.util.BaseUtil.request({
                     url: '/api/commons/number/getMaxnumber',
                     headers: {

frontend/saas-web/app/view/main/Main.js

@@ -126,7 +126,6 @@ Ext.define('saas.view.main.Main', {
                 {
                     ui: 'header',
                     arrowVisible: false,
-                    id:"userImage", 
                     cls:' sa-nav-button',   
                     width: 50,
                     height:50,    

frontend/saas-web/app/view/main/Navigation.js

@@ -110,8 +110,8 @@ Ext.define('saas.view.main.Navigation', {
                         var menu = view.up('menu'),
                             menuView = view.el.dom.getElementsByClassName('x-navitem-menu')[0],
                             menuBox = menuView.getBoundingClientRect(),
-                            menuViewWidth = menuBox.width,
-                            menuViewHeight = menuBox.height,
+                            menuViewWidth = menuBox.width + 12,
+                            menuViewHeight = menuBox.height + 10,
                             menuItem = menuView.getElementsByClassName('menuitem');
 
                         menu.setWidth(menuViewWidth);
@@ -184,6 +184,9 @@ Ext.define('saas.view.main.Navigation', {
                 navItem: navItem,
                 id: menuId,
                 width: window.innerWidth,
+                cls: 'x-nav-menu',
+                layout: 'fit',
+                bodyPadding: 5,
                 style: {
                     borderTopRightRadius: '4px',
                     borderBottomRightRadius: '4px'

frontend/saas-web/app/view/main/Navigation.scss

@@ -79,6 +79,19 @@ $nav-font-color-over: #fff;
 
                                 .nav-inner-wrap {
 
+                                    &:after {
+                                        content: ' ';
+                                        width: 0;
+                                        height: 0;
+                                        border: 8px solid transparent;
+                                        border-right-color: #fff;
+                                        border-left: none;
+                                        position: absolute;
+                                        right: 0;
+                                        top: 22px;
+                                        z-index: 999999;
+                                    }
+
                                     .nav-inner-icon {
                                         color: $nav-font-color-over;
                                     }
@@ -96,6 +109,11 @@ $nav-font-color-over: #fff;
     }
 }
 
+.x-nav-menu {
+    // border-width: 5px;
+    // border-left: none;
+}
+
 .x-navitem-menu {
     position: absolute;
     z-index: 9999;
@@ -112,7 +130,7 @@ $nav-font-color-over: #fff;
 
             &:first-child {
                 .menu-content {
-                    border-right: 1px solid #EEF9FE;
+                    border-right: 1px dashed #dce2e4;
                 }
             }
 

frontend/saas-web/app/view/stock/report/ProdinoutCount.js

@@ -50,7 +50,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
         width: 80
     }, {
         text: '仓库',
-        dataIndex:'pd_whcode',
+        dataIndex:'wh_description',
         width: 150
     }, {
         text: '期初',

frontend/saas-web/ext/packages/ux/src/feature/MySummary.js

@@ -30,16 +30,6 @@ Ext.define('Ext.ux.feature.MySummary', {
 
         me.callParent([grid]);
 
-        // var mySummaryStore = grid.mySummaryStore = Ext.create('Ext.data.Store', {
-        //     fields: ['name', 'label', 'typeLabel', 'type', 'value'],
-        //     data: [{
-        //         name: 'xxx',
-        //         label: '111',
-        //         type: 'sum',
-        //         value: 0
-        //     }]
-        // });
-
         grid.on({
             mysummarychange: me.refreshData,
             scope: me
@@ -129,54 +119,6 @@ Ext.define('Ext.ux.feature.MySummary', {
         newSummarys = me.getSummarys(grid);
 
         summaryBar.update(newSummarys);
- 
-        // if (!view.rendered) {
-        //     return;
-        // }
- 
-        // record = me.createSummaryRecord(view);
-        // newRowDom = Ext.fly(view.createRowElement(record, -1)).down(selector, true);
- 
-        // if (!newRowDom) {
-        //     return;
-        // }
- 
-        // // Summary row is inside the docked summaryBar Component 
-        // if (dock) {
-        //     p = me.summaryBar.item.dom.firstChild;
-        //     oldRowDom = p.firstChild;
-            
-        //     p.insertBefore(newRowDom, oldRowDom);
-        //     p.removeChild(oldRowDom);
-        // }
-        // // Summary row is a regular row in a THEAD inside the View. 
-        // // Downlinked through the summary record's ID 
-        // else {
-        //     oldRowDom = view.el.down(selector, true);
-        //     p = oldRowDom && oldRowDom.parentNode;
-            
-        //     if (p) {
-        //         p.removeChild(oldRowDom);
-        //     }
-            
-        //     // We're always inserting the new summary row into the last rendered row, 
-        //     // unless no rows exist. In that case we will be appending to the special 
-        //     // placeholder in the node container. 
-        //     p = view.getRow(view.all.last());
-            
-        //     if (p) {
-        //         p = p.parentElement;
-        //     }
-        //     // View might not have nodeContainer yet. 
-        //     else {
-        //         p = me.getSummaryRowPlaceholder(view);
-        //         p = p && p.tBodies && p.tBodies[0];
-        //     }
-            
-        //     if (p) {
-        //         p.appendChild(newRowDom);
-        //     }
-        // }
     },
 
     getSummaryBar: function() {