Merge remote-tracking branch 'origin/dev' into dev

applications/document/document-server/src/main/resources/mapper/CustomerMapper.xml

@@ -370,12 +370,12 @@
   </select>
 
   <select id="validNameAndCodeWhenInsert" parameterType="com.usoftchina.saas.document.entities.Customer" resultType="int">
-    select count(1) from customer where cu_code = #{cu_code,jdbcType=VARCHAR} or cu_name = #{cu_name,jdbcType=VARCHAR}
+    select count(1) from customer where (cu_code = #{cu_code,jdbcType=VARCHAR} or cu_name = #{cu_name,jdbcType=VARCHAR}) and companyId =#{companyId}
   </select>
 
   <select id="validNameAndCodeWhenUpdate" parameterType="com.usoftchina.saas.document.entities.Customer" resultType="int">
     select count(1) from customer where (cu_code = #{cu_code,jdbcType=VARCHAR} or cu_name = #{cu_name,jdbcType=VARCHAR})
-    and cu_id != #{id}
+    and cu_id != #{id} and companyId =#{companyId}
   </select>
 
 

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -306,7 +306,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
         var sum_pbd_nowbalance = store2.sum('pbd_nowbalance'); // 本次核销金额合计
 
         var flag = sum_pd_amount + pb_discounts - sum_pbd_nowbalance;
-
+         viewModel.set("pb_preamount",flag);
         if(flag != 0) {
             var t = flag > 0 ? '大' : '小';
 

frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -382,6 +382,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
 
         var flag = sum_rd_amount + rb_discounts - sum_rbd_nowbalance;
 
+        viewModel.set("rb_preamount",flag);
         if(flag != 0) {
             var t = flag > 0 ? '大' : '小';
 

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

@@ -116,6 +116,8 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             from:'pr_spec',to:'pr_spec'
                         },{
                             from:'pr_purcprice',to:'pd_price'
+                        },{
+                            from:'pr_zxbzs',to:'pr_zxbzs'
                         }],
                         //联想设置
                         dbtpls:[{

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

@@ -94,20 +94,17 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                         dataUrl: '/api/document/customer/list',
                         // dataUrl:'http://localhost:9480/customer/list',
                         dbfinds: [{
-                            from: 'id',
-                            to: 'pi_custid',ignore:true
+                            from: 'id',to: 'pi_custid',ignore:true
                         }, {
-                            from: 'cu_code',
-                            to: 'pi_custcode'
+                            from: 'cu_code',to: 'pi_custcode'
                         }, {
-                            from: 'cu_name',
-                            to: 'pi_custname'
+                            from: 'cu_name',to: 'pi_custname'
                         }],
                         dbtpls: [{
-                            field: 'pi_custcode',
+                            field: 'cu_code',
                             width: 100
                         }, {
-                            field: 'pi_custname',
+                            field: 'cu_name',
                             width: 100
                         }],
                         defaultCondition:"cu_statuscode='OPEN'",