修改采购模块

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

@@ -9,95 +9,30 @@ Ext.define('saas.view.stock.make.QueryPanel', {
     
     queryFormItems: [{
         xtype: 'hidden',
-        name: 'pu_id',
-        bind: '{pu_id}',
+        name: 'ma_id',
+        bind: '{ma_id}',
         fieldLabel: 'ID',
         allowBlank: true,
         getCondition: function(value) {
-            return 'pu_id=' + value;
+            return 'ma_id=' + value;
         }
-    }, {
+    },{
         xtype: 'textfield',
-        name: 'pu_code',
-        bind: '{pu_code}',
+        name: 'ma_code',
+        bind: '{ma_code}',
         fieldLabel: '单据编号'
-    }, {
-        xtype: 'condatefield',
-        name: 'pu_date',
-        bind: '{pu_date}',
-        fieldLabel: '采购日期',
-        columnWidth: 0.5,
-        operation: 'between'
-    }, {
-        xtype: 'dbfindtrigger',
-        name: 'pu_vendcode',
-        bind: '{pu_vendcode}',
-        fieldLabel: '供应商编号'
-    }, {
-        xtype: 'dbfindtrigger',
-        name: 'pu_vendname',
-        bind: '{pu_vendname}',
-        fieldLabel: '供应商名称'
-    }, {
-        xtype: 'dbfindtrigger',
-        name: 'pd_prodcode',
-        bind: '{pd_prodcode}',
-        fieldLabel: '物料编号',
-        showDetail: true
-    }, {
+    },{
         xtype: 'textfield',
-        name: 'pr_detail',
-        bind: '{pr_detail}',
-        fieldLabel: '物料名称',
-        showDetail: true
-    }, {
-        xtype: 'combobox',
-        name: 'pu_statuscode',
-        fieldLabel: '审核状态',
-        queryMode: 'local',
-        displayField: 'pu_status',
-        valueField: 'pu_statuscode',
-        editable:false,
-        store: Ext.create('Ext.data.ArrayStore', {
-            fields: ['pu_statuscode', 'pu_status'],
-            data: [
-                ["ALL", "全部"],
-                ["AUDITED", "已审核"],
-                ["UNAUDITED", "未审核"]
-            ]
-        }),
-        getCondition: function(value) {
-            if(value == 'ALL') {
-                return '1=1';
-            }else {
-                return 'pu_statuscode=\'' + value + '\'';
-            }
-        }
-    }, {
-        xtype: 'multicombo',
-        name: 'pu_acceptstatuscode',
-        bind: '{pu_acceptstatuscode}',
-        fieldLabel: '入库状态',
-        datas: [
-            ["TURNIN", "已入库"],
-            ["UNTURNIN", "未入库"],
-            ["PARTIN", "部分入库"]
-        ]
-    }],
-    moreQueryFormItems: [{
+        name: 'ma_type',
+        bind: '{ma_type}',
+        fieldLabel: '类型'
+    },{
         xtype: 'textfield',
-        name: 'pu_buyername',
-        fieldLabel: '采购员'
-    }, {
-        xtype: 'textfield',
-        name: 'pu_total',
-        fieldLabel: '金额'
-    }, {
-        xtype: 'condatefield',
-        name: 'pu_delivery',
-        fieldLabel: '交货日期',
-        columnWidth: 1
+        name: 'ma_prodcode',
+        bind: '{ma_prodcode}',
+        fieldLabel: '产品编号'
     }],
+    moreQueryFormItems: [],
     queryGridConfig: {
         idField: 'id',
         codeField: 'ma_code',
@@ -107,85 +42,52 @@ Ext.define('saas.view.stock.make.QueryPanel', {
         baseVastUrl: '/api/storage/make/',
         baseColumn: [{
             text: 'id',
-            dataIndex: 'pu_id',
+            dataIndex: 'id',
             width: 100,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
-            dataIndex: 'pu_code',
+            dataIndex: 'ma_code',
             width: 200
         }, {
-            text: '单据状态',
-            dataIndex: 'pu_status',
+            text: '类型',
+            dataIndex: 'ma_type',
             width: 120
         }, {
-            text: '下单日期',
-            dataIndex: 'pu_indate',
-            xtype: 'datecolumn',
+            text: '产品编号',
+            dataIndex: 'ma_prodcode',
             width: 200
         }, {
-            text: '供应商名称',
-            dataIndex: 'pu_vendname',
+            text: '产品名称',
+            dataIndex: 'ma_proddetail',
             width: 120
         }, {
-            text: '含税金额',
-            dataIndex: 'pu_taxtotal',
-            xtype: 'numbercolumn',
+            text: '版本号',
+            dataIndex: 'ma_version',
             width: 120
         }, {
-            text: '金额',
-            dataIndex: 'pu_total',
+            text: '数量',
+            dataIndex: 'ma_qty',
             xtype: 'numbercolumn',
             width: 120,
             flex: 1
-        }],
-        relativeColumn: [{
-            text: 'id',
-            dataIndex: 'pu_id',
-            width: 100,
-            xtype: 'numbercolumn'
-        }, {
-            text: '单据编号',
-            dataIndex: 'pu_code',
-            width: 200
-        }, {
-            text: '单据状态',
-            dataIndex: 'pu_status',
-            width: 120
-        }, {
-            text: '下单日期',
-            dataIndex: 'pu_indate',
-            xtype: 'datecolumn',
-            width: 200
-        }, {
-            text: '供应商名称',
-            dataIndex: 'pu_vendname',
-            width: 120
-        }, {
-            text: '采购序号',
-            dataIndex: 'pd_detno',
-            xtype: 'numbercolumn',
-            width: 120
-        }, {
-            text: '物料编号',
-            dataIndex: 'pd_prodcode',
-            width: 120
-        }, {
-            text: '数量',
-            dataIndex: 'pd_qty',
-            xtype: 'numbercolumn',
-            width: 120
-        }, {
-            text: '单价',
-            dataIndex: 'pd_price',
-            xtype: 'numbercolumn',
-            width: 120
-        }, {
-            text: '已转数',
-            dataIndex: 'pd_ytqy',
+        },{
+            text: '单位',
+            dataIndex: 'ma_produnit',
+            width: 120,
+            flex: 1
+        },{
+            text: '单位成本',
+            dataIndex: 'ma_total',
             xtype: 'numbercolumn',
             width: 120,
             flex: 1
-        }]
+        },{
+            text: '状态',
+            dataIndex: 'ma_status',
+            width: 120,
+            flex: 1
+        }],
+        relativeColumn: []
     }
 });