代码提交

frontend/saas-web/app/Application.scss

@@ -617,3 +617,15 @@ input::-webkit-input-placeholder {
 .x-quotation-detail{
   width: 1105px !important;
 }
+
+.x-btn-quotation{
+  .x-btn-over {
+    .x-btn-wrap {
+      .x-btn-button {
+        .x-btn-inner {
+          color: #34baf6;
+        }
+      }
+    }
+  }
+}

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

@@ -139,79 +139,8 @@ Ext.define('saas.view.main.Navigation', {
                 singleSelect: true,
                 itemSelector: 'menu',
                 listeners: {
-                    boxready: function (view, width, height, eOpts) {
-                        var menu = view.up('menu'),
-                            menuView = view.el.dom.getElementsByClassName('x-navitem-menu')[0],
-                            menuBox = menuView.getBoundingClientRect(),
-                            menuViewWidth = menuBox.width + me.menuPadding * 2,
-                            menuViewHeight = menuBox.height + me.menuPadding * 2,
-                            menuItem = menuView.getElementsByClassName('menuitem');
-
-                        menu.setWidth(menuViewWidth);
-                        menu.setHeight(menuViewHeight);
-                        menu.updateLayout();
-
-                        view.el.dom.addEventListener('mouseenter', function (e) {
-                            menu.show();
-                            menu.navItem.classList.add(menu.navView.overItemCls);
-                        });
-
-                        view.el.dom.addEventListener('mouseleave', function (e) {
-                            menu.navItem.classList.remove(menu.navView.overItemCls);
-                            menu.hide();
-                            // var ex = e.clientX,
-                            //     ey = e.clientY,
-                            //     box = menuView.getBoundingClientRect(),
-                            //     navItem = menu.navItem,
-                            //     navBox = navItem.getBoundingClientRect();
-
-                            // if ((ex <= box.left && (ey <= (navBox.top - 5) || ey >= (navBox.top + navBox.height))) || ey <= (box.top - 5) || ex >= (box.left + box.width + 5) || ey >= (box.top + box.height + 5)) {
-                            //     menu.navItem.classList.remove(menu.navView.overItemCls);
-                            //     menu.hide();
-                            // }
-                        });
-
-                        Ext.Array.each(menuItem, function (mi) {
-                            var menuItemText = mi.getElementsByClassName('item-text');
-                            var menuItemIcon = mi.getElementsByClassName('item-icon');
-
-                            Ext.Array.each(menuItemText, function (item) {
-                                item.addEventListener('click', function (e) {
-                                    var target = e.target,
-                                    dataset = target.dataset,
-                                    viewType = dataset.viewtype,
-                                    type = dataset.type,
-                                    text = dataset.text,
-                                    config = dataset.config,
-                                    id = dataset.id;
-
-                                    var tabTitle = text,
-                                    tabId = 'maintab-' + type + '-' + id;
-
-                                    menu.navItem.classList.remove(menu.navView.overItemCls);
-                                    saas.util.BaseUtil.openTab(viewType, tabTitle, tabId,config);
-                                    menu.hide();
-                                });
-                            });
-                            Ext.Array.each(menuItemIcon, function (item) {
-                                item.addEventListener('click', function (e) {
-                                    var target = e.target,
-                                    dataset = target.dataset,
-                                    viewType = dataset.viewtype,
-                                    type = dataset.type,
-                                    text = dataset.text,
-                                    id = dataset.id;
-
-                                    var tabTitle ='新增' + text,
-                                    tabId = viewType + '-add';
-
-                                    menu.navItem.classList.remove(menu.navView.overItemCls);
-                                    saas.util.BaseUtil.openTab(viewType, tabTitle, tabId);
-                                    menu.hide();
-                                });
-                            });
-                        });
-                    },
+                    // boxready: function (view, width, height, eOpts) {
+                    // },
                 }
             });
             var menu = Ext.create('Ext.menu.Menu', {
@@ -226,7 +155,86 @@ Ext.define('saas.view.main.Navigation', {
                 items: [view]
             });
         }
+        menu.items.items[0].store.removeAll();
+        menu.items.items[0].store.loadData(menuItems);
         menu.showAt(pos);
+        me.refresh(menu.items.items[0],pos)
+    },
+
+    refresh:function(view,pos){
+        var me = this;
+        var menu = view.up('menu'),
+        menuView = view.el.dom.getElementsByClassName('x-navitem-menu')[0],
+        menuBox = menuView.getBoundingClientRect(),
+        menuViewWidth = menuBox.width + me.menuPadding * 2,
+        menuViewHeight = menuBox.height + me.menuPadding * 2,
+        menuItem = menuView.getElementsByClassName('menuitem');
+
+        menu.setX(pos[0]);
+        menu.setWidth(menuViewWidth);
+        menu.setHeight(menuViewHeight);
+        menu.updateLayout();
+
+        view.el.dom.addEventListener('mouseenter', function (e) {
+            menu.show();
+            menu.navItem.classList.add(menu.navView.overItemCls);
+        });
+
+        view.el.dom.addEventListener('mouseleave', function (e) {
+            menu.navItem.classList.remove(menu.navView.overItemCls);
+            menu.hide();
+            // var ex = e.clientX,
+            //     ey = e.clientY,
+            //     box = menuView.getBoundingClientRect(),
+            //     navItem = menu.navItem,
+            //     navBox = navItem.getBoundingClientRect();
+
+            // if ((ex <= box.left && (ey <= (navBox.top - 5) || ey >= (navBox.top + navBox.height))) || ey <= (box.top - 5) || ex >= (box.left + box.width + 5) || ey >= (box.top + box.height + 5)) {
+            //     menu.navItem.classList.remove(menu.navView.overItemCls);
+            //     menu.hide();
+            // }
+        });
+
+        Ext.Array.each(menuItem, function (mi) {
+            var menuItemText = mi.getElementsByClassName('item-text');
+            var menuItemIcon = mi.getElementsByClassName('item-icon');
+
+            Ext.Array.each(menuItemText, function (item) {
+                item.addEventListener('click', function (e) {
+                    var target = e.target,
+                    dataset = target.dataset,
+                    viewType = dataset.viewtype,
+                    type = dataset.type,
+                    text = dataset.text,
+                    config = dataset.config,
+                    id = dataset.id;
+
+                    var tabTitle = text,
+                    tabId = 'maintab-' + type + '-' + id;
+
+                    menu.navItem.classList.remove(menu.navView.overItemCls);
+                    saas.util.BaseUtil.openTab(viewType, tabTitle, tabId,config);
+                    menu.hide();
+                });
+            });
+            Ext.Array.each(menuItemIcon, function (item) {
+                item.addEventListener('click', function (e) {
+                    var target = e.target,
+                    dataset = target.dataset,
+                    viewType = dataset.viewtype,
+                    type = dataset.type,
+                    text = dataset.text,
+                    id = dataset.id;
+
+                    var tabTitle ='新增' + text,
+                    tabId = viewType + '-add';
+
+                    menu.navItem.classList.remove(menu.navView.overItemCls);
+                    saas.util.BaseUtil.openTab(viewType, tabTitle, tabId);
+                    menu.hide();
+                });
+            });
+        });
     },
 
     hideNavMenu: function (view, record, item, index, e, eOpts) {

frontend/saas-web/app/view/purchase/quotationList/DataList.js

@@ -128,15 +128,15 @@ Ext.define('saas.view.purchase.quotationList.DataList', {
             text:'查询',
             listeners: {
                 click:function(b){
-                    var grid = b.ownerCt.ownerCt;
+                    var grid = b.ownerCt.ownerCt.ownerCt.ownerCt;
                     grid.condition = grid.getConditions();
                     grid.store.loadPage(1);
                 }
             }
         },{
-            style:'text-align: center',
+            style:'text-align: center;',
             xtype:'displayfield',
-            value:'立即询价'
+            value:'<a href=\"javascript:saas.util.BaseUtil.openTab(\'purchase-sendQuotation-datalist\',\'发起询价\',\'maintab-query-sendQuotation\')\">立即询价</a>'
         }]},
         items:[{
             columnWidth:0.33,
@@ -292,10 +292,6 @@ Ext.define('saas.view.purchase.quotationList.DataList', {
                 },
                 listeners: {
                     beforeload: function (store, op) {
-                        var condition = me.condition;
-                        if (Ext.isEmpty(condition)) {
-                            condition = '';
-                        }
                         var date = Ext.ComponentQuery.query('[name=_date]')[0];
                         var from = date.value.from || '';
                         if(!Ext.isDate(from)){
@@ -311,15 +307,17 @@ Ext.define('saas.view.purchase.quotationList.DataList', {
                         }else{
                             to = date.value.to.getTime()
                         }
+                        var search = Ext.ComponentQuery.query('[name=search]')[0].value;
                         var quoted = Ext.ComponentQuery.query('[name=quoted]')[0].value;
+                        var overdue = Ext.ComponentQuery.query('[name=overdue]')[0].value;
                         Ext.apply(store.proxy.extraParams, {
-                            keyword :condition==''?' ':condition[0].value,
+                            keyword :search,//search==''?' ':search,
                             pageNumber: op._page,
                             pageSize: store.pageSize,
                             quoted:quoted,
                             fromDate:from,
                             endDate:to,
-                            overdue:0
+                            overdue:overdue
                         });
                     }
                 }

frontend/saas-web/app/view/purchase/sendQuotation/DataList.js

@@ -11,7 +11,7 @@ Ext.define('saas.view.purchase.sendQuotation.DataList', {
     layout:'fit',
     
     dataUrl:'/api/document/product/list',                 
-    sendQuotationUrl:'/api/commons/number/delete/',
+    sendQuotationUrl:'http://10.1.80.23:8560/api/purchase/purchase/inquiry/send',
 
     plugins: [{
         ptype: 'menuclipboard'
@@ -66,14 +66,13 @@ Ext.define('saas.view.purchase.sendQuotation.DataList', {
         text:'发起询价',
         listeners: {
             click: function(){
-                var form = this.ownerCt.ownerCt;
-                var grid = this.ownerCt.ownerCt.items.items[0].grid;
-                var endDate = form.down('[name=endDate]');
+                var grid = this.ownerCt.ownerCt;
+                var endDate = grid.down('[name=endDate]');
                 if(!endDate.value||endDate.value==0){
                     saas.util.BaseUtil.showErrorToast('请填写报价截至天数');
                     return false;
                 }
-                form.onVastDeal(sendQuotation,'发起询价');
+                grid.onVastDeal(grid.sendQuotationUrl,endDate.value);
             }
         }
     }],
@@ -154,9 +153,8 @@ Ext.define('saas.view.purchase.sendQuotation.DataList', {
                             condition = '';
                         }
                         Ext.apply(store.proxy.extraParams, {
-                            w:1,
-                            page: op._page,
-                            count: store.pageSize,
+                            number: op._page,
+                            size: store.pageSize,
                             condition: JSON.stringify(condition)
                         });
                     }
@@ -175,29 +173,31 @@ Ext.define('saas.view.purchase.sendQuotation.DataList', {
         me.callParent(arguments);
     },
 
-    onVastDeal:function(url,type){
-        var form = this.ownerCt;
+    onVastDeal:function(url,leadTime){
         var grid = this;
-        var data = grid.getGridSelected(type);
+        var data = grid.getGridSelected(leadTime);
         if(!data){
             saas.util.BaseUtil.showErrorToast('请勾选符合条件的行进行操作。');
             return false;
         }
         if(data&&data.length>0){
-            var params = JSON.stringify({baseDTOs:data});
+            grid.setLoading(true);
+            var params = JSON.stringify(data);
             saas.util.BaseUtil.request({
-                    url: url,
-                    params: params,
-                    method: 'POST',
-                    async:false
-                })
-                .then(function() {
-                    saas.util.BaseUtil.showSuccessToast('操作成功');
-                    grid.store.load();
-                })
-                .catch(function(e) {
-                    saas.util.BaseUtil.showErrorToast('操作失败: ' + e.message);
-                });
+                url: url,
+                params: params,
+                method: 'POST'
+            })
+            .then(function(res) {
+                grid.setLoading(false);
+                saas.util.BaseUtil.showSuccessToast('操作成功');
+                debugger
+                grid.store.load();
+            })
+            .catch(function(e) {
+                grid.setLoading(false);
+                saas.util.BaseUtil.showErrorToast('操作失败: ' + e.message);
+            });
         }else{
             saas.util.BaseUtil.showErrorToast('请勾选至少一条明细。');
         }
@@ -260,30 +260,20 @@ Ext.define('saas.view.purchase.sendQuotation.DataList', {
         return columns;
     },
 
-    getGridSelected:function(type){
-        var isErrorSelect = false;
-        var checkField = this.statusCodeField;
+    getGridSelected:function(leadTime){
         var me = this,
         items = me.selModel.getSelection(),
         data = new Array() ;
         Ext.each(items, function(item, index){
-            if(!Ext.isEmpty(item.data[me.idField])){
-                var o = new Object();
-                if(me.idField){
-                    o['id'] = item.data[me.idField];
-                }
-                if(me.codeField){
-                    o['code'] = item.data[me.codeField];
-                }
-                if(type&&type==item.data[checkField]){
-                    isErrorSelect = true
-                }
-                data.push(o);
-            }
+            var o = new Object();
+            o['prodCode']=item.get('pr_code');
+            o['prodName']=item.get('pr_detail');
+            o['prodSpec']=item.get('pr_spec');
+            o['prodOrispeccode']=item.get('pr_orispeccode');
+            o['prodBrand']=item.get('pr_brand');
+            o['leadTime']=leadTime;
+            data.push(o);
         });
-        if(isErrorSelect){
-            return false;
-        }
 		return data;
     },
 

frontend/saas-web/app/view/sys/baseconfig/FormPanel.js

@@ -106,6 +106,7 @@ Ext.define('saas.view.sys.baseconfig.FormPanel', {
                         d[item.code] = item.data;
                     });
                     viewModel.setData(d);
+                    viewModel._parent.setData(d);
                 }
             }
         })