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

applications/document/document-dto/src/main/java/com.usoftchina.saas.document.dto/ProductDTO.java

@@ -8,7 +8,7 @@ import java.util.Date;
 @Data
 public class ProductDTO implements Serializable {
 
-    private Long pr_id;
+    private Long id;
     private String pr_code;
     private String pr_detail;
     private String pr_spec;

applications/sale/sale-server/src/main/resources/mapper/ProdIODetailMapper.xml

@@ -42,7 +42,7 @@
     <result column="pd_yqty" jdbcType="INTEGER" property="pd_yqty" />
     <result column="pd_ioid" jdbcType="INTEGER" property="pd_ioid" />
     <association property="productDTO" javaType="com.usoftchina.saas.document.dto.ProductDTO">
-      <id column="pr_id" property="pr_id"/>
+      <id column="pr_id" property="id"/>
       <result column="pr_code" property="pr_code"/>
       <result column="pr_detail" property="pr_detail"/>
       <result column="pr_spec" property="pr_spec"/>

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

@@ -36,7 +36,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
          xtype: 'button',
          text: '转采购验收单',
          bind: {
-            hidden: '{!id}'
+            hidden: '{turnHidden}'
         },
          handler: 'turnIn'
      }],

frontend/saas-web/app/view/purchase/purchase/FormPanelModel.js

@@ -2,4 +2,13 @@ Ext.define('saas.view.purchase.purchase.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.purchase-purchase-formpanel',
 
+
+    formulas:{
+        turnHidden:{
+            bind:'{pu_statuscode}',
+            get:function(value){
+                return value!='AUDITED';
+            }
+        }
+    }
 });

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

@@ -32,6 +32,15 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         },{
                             field:'ve_name',width:100
                         }],
+                        //联想查询条件
+                        dbtplfield:"ve_name",
+                        //放大镜窗口字段
+                        dbSearchFields:[{
+                            xtype : "textfield", 
+                            name : "ve_name", 
+                            fieldLabel : "供应商名称", 
+                            columnWidth : 0.25
+                        }],                        
                         dbColumns:[{
                             conditionCode:'ve_id',
                             "text": "供应商ID",

frontend/saas-web/app/view/purchase/purchaseOut/FormPanelController.js

@@ -31,6 +31,15 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                         },{
                             field:'ve_name',width:100
                         }],
+                        //联想查询条件
+                        dbtplfield:"ve_name",
+                        //放大镜窗口字段
+                        dbSearchFields:[{
+                            xtype : "textfield", 
+                            name : "ve_name", 
+                            fieldLabel : "供应商名称", 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             conditionCode:'ve_id',
                             "text": "供应商ID",

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

@@ -31,6 +31,15 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         },{
                             field:'ve_name',width:100
                         }],
+                        //联想查询条件
+                        dbtplfield:"ve_name",
+                        //放大镜窗口字段
+                        dbSearchFields:[{
+                            xtype : "textfield", 
+                            name : "ve_name", 
+                            fieldLabel : "供应商名称", 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             conditionCode:'id',
                             "text": "供应商ID",
@@ -71,7 +80,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
                         dataUrl:'/api/document/customer/list',
                         // dataUrl:'http://localhost:9480/customer/list',
                         dbfinds:[{
@@ -86,6 +96,15 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         },{
                             field:'pi_custname',width:100
                         }],
+                        //联想查询条件
+                        dbtplfield:"cu_name",
+                        //放大镜窗口字段
+                        dbSearchFields:[{
+                            xtype : "textfield", 
+                            name : "cu_name", 
+                            fieldLabel : "客户名称", 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             conditionCode:'id',
                             "text": "客户ID",

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

@@ -25,6 +25,15 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                         },{
                             field:'ve_name',width:100
                         }],
+                        //联想查询条件
+                        dbtplfield:"ve_name",
+                        //放大镜窗口字段
+                        dbSearchFields:[{
+                            xtype : "textfield", 
+                            name : "ve_name", 
+                            fieldLabel : "供应商名称", 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             conditionCode:'id',
                             "text": "供应商ID",
@@ -65,7 +74,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             'dbfindtrigger[name=pi_custname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-
+                        addXtype: 'document-customer-formpanel',
+                        addTitle: '客户资料',
                         dataUrl: '/api/document/customer/list',
                         // dataUrl:'http://localhost:9480/customer/list',
                         dbfinds: [{
@@ -85,6 +95,15 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             field: 'pi_custname',
                             width: 100
                         }],
+                        //联想查询条件
+                        dbtplfield:"cu_name",
+                        //放大镜窗口字段
+                        dbSearchFields:[{
+                            xtype : "textfield", 
+                            name : "cu_name", 
+                            fieldLabel : "客户名称", 
+                            columnWidth : 0.25
+                        }],
                         dbColumns: [{
                             conditionCode: 'id',
                             "text": "客户ID",

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

@@ -25,6 +25,15 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         },{
                             field:'ve_name',width:100
                         }],
+                        //联想查询条件
+                        dbtplfield:"ve_name",
+                        //放大镜窗口字段
+                        dbSearchFields:[{
+                            xtype : "textfield", 
+                            name : "ve_name", 
+                            fieldLabel : "供应商名称", 
+                            columnWidth : 0.25
+                        }],                        
                         dbColumns:[{
                             conditionCode:'id',
                             "text": "供应商ID",
@@ -65,11 +74,10 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-
-                        dataUrl:'/api/document/customer/list',
-                        // dataUrl:'http://localhost:9480/customer/list',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
+                        dataUrl:'/api/document/customer/list',
+                        // dataUrl:'http://localhost:9480/customer/list',
                         dbfinds:[{
                             from:'id',to:'pi_custid'
                         },{
@@ -82,6 +90,15 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         },{
                             field:'pi_custname',width:100
                         }],
+                        //联想查询条件
+                        dbtplfield:"cu_name",
+                        //放大镜窗口字段
+                        dbSearchFields:[{
+                            xtype : "textfield", 
+                            name : "cu_name", 
+                            fieldLabel : "客户名称", 
+                            columnWidth : 0.25
+                        }],                        
                         dbColumns:[{
                             conditionCode:'id',
                             "text": "客户ID",