BOM放大镜去掉品牌、BOM查询列表新增型号规格、BOM资料新增产品型号、制造单界面&列表新增产品型号、产品规格字段

frontend/saas-web/app.json

@@ -285,7 +285,7 @@
                 "accountEnterprise":"https://saas-dev.usoftchina.com:5443/#/enterprise",
                 "basePath": {
                     "https": "https://saas-api-dev.usoftchina.com:5443",
-                    "http": "http://192.168.0.181:8560"
+                    "http": "http://192.168.253.58:8560"
                 },
                 "urlPattern": "^\/api\/"
             }

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

@@ -44,10 +44,6 @@ Ext.define('saas.view.core.dbfind.types.BomDbfindTrigger', {
         text: "产品名称",
         width: 200,
         dataIndex: "bo_mothername",
-    }, {
-        text: "产品品牌",
-        width: 150,
-        dataIndex: "pr_brand",
     }, {
         text: "产品型号",
         width: 150,

frontend/saas-web/app/view/document/bom/BasePanel.js

@@ -83,6 +83,16 @@ Ext.define('saas.view.document.bom.BasePanel', {
             dataIndex : "bo_mothername", 
             width :200.0, 
         }, 
+        {
+            text : "产品型号", 
+            dataIndex : "pr_orispeccode", 
+            width :150.0, 
+        }, 
+        {
+            text : "产品规格", 
+            dataIndex : "pr_spec", 
+            width :150.0, 
+        }, 
         {
             text : "产品状态", 
             dataIndex : "bo_status", 

frontend/saas-web/app/view/document/bom/FormController.js

@@ -16,6 +16,8 @@ Ext.define('saas.view.document.bom.FormController', {
                             from:'pr_detail',to:'bo_mothername'
                         }, {
                             from:'pr_spec',to:'pr_spec'
+                        }, {
+                            from:'pr_orispeccode',to:'pr_orispeccode'
                         }, {
                             from:'id',to:'bo_motherid',ignore:true
                         }],

frontend/saas-web/app/view/document/bom/FormPanel.js

@@ -65,11 +65,17 @@ Ext.define('saas.view.document.bom.FormPanel', {
         fieldLabel: '产品名称',
         readOnly:true,
         allowBlank: false
+    },{
+        xtype: 'textfield',
+        name: 'pr_orispeccode',
+        fieldLabel: '产品型号',
+        readOnly:true,
     },{
         xtype: 'textfield',
         name: 'pr_spec',
         fieldLabel: '产品规格',
         readOnly:true,
+        ignore:true
     },{
         xtype: 'textfield',
         name: 'bo_version',

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

@@ -67,6 +67,12 @@ Ext.define('saas.view.stock.make.FormPanel', {
         fieldLabel : "产品名称",
         readOnly:true,
         columnWidth: 0.25
+    },{
+        xtype : "textfield", 
+        name : "ma_prodorispec", 
+        fieldLabel : "产品型号",
+        readOnly:true,
+        columnWidth: 0.25,
     },{
         xtype : "textfield", 
         name : "ma_prodspec", 

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

@@ -96,6 +96,9 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         }, {
                             from: 'bo_version',
                             to: 'ma_version'
+                        }, {
+                            from: 'pr_orispeccode',
+                            to: 'ma_prodorispec'
                         }],
                         aftertrigger: function (f, record) {
                             me.getBomData(record.data.id)

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

@@ -127,6 +127,14 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             text: '产品名称',
             dataIndex: 'ma_proddetail',
             width: 200
+        }, {
+            text: '产品型号',
+            dataIndex: 'ma_prodorispec',
+            width: 200
+        }, {
+            text: '产品规格',
+            dataIndex: 'ma_prodspec',
+            width: 200
         }, {
             text: '版本号',
             dataIndex: 'ma_version',