修改采购模块

frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -357,7 +357,18 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         name : "pi_auditdate", 
         fieldLabel : "审核日期",
         readOnly:true
-    }]
+    }],
+    beforeAudit:function(){
+        var me = this,
+        viewModel = me.getViewModel(),
+        store = viewModel.get('detail0').detailStore;
+        store.each(function(item){
+            if(item.data.pd_price==0){
+                showToast(item.data.pd_pdno+'行'+item.data.pd_prodcode+'物料单价为0');
+            }
+        });
+        return true;
+    }
 
 
 

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -76,14 +76,10 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-<<<<<<< HEAD
-                            align: 'end'
-=======
                             align:'end', 
                             renderer : function(v) {
                                 return Ext.util.Format.number(v, '0');
                             }
->>>>>>> origin/dev
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

frontend/saas-web/app/view/stock/make/FormPanelController.js

@@ -358,17 +358,6 @@ Ext.define('saas.view.stock.make.FormPanelController', {
 
                 }
             },
-
-
-
-
-
-
-
-
-
-
-
             //从表多选放大镜赋值关系 以及 tpl模板
             'multidbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){