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

base-servers/account/account-server/src/main/resources/mapper/AccountCompanyMapper.xml

@@ -14,7 +14,7 @@
         delete from ac_account_company where company_id=#{companyId}
     </delete>
     <select id="getCompanyListByAccountMobile" resultType="com.usoftchina.saas.account.dto.CompanyRspDTO">
-        SELECT cmp.id,cmp.name,cmp.uu,cmp.business_code businessCode,cmp.address,accmp.is_default default_,'1' saas_,aci.realname admin,cmp.creator_id adminId,cmp.type,ac.email adminEmail,ac.mobile adminMobile from ac_company cmp
+        SELECT cmp.id,cmp.name,cmp.uu,cmp.business_code businessCode,cmp.address,accmp.is_default default_,'1' saas_,aci.realname admin,cmp.creator_id adminId,cmp.type,aci.email adminEmail,aci.mobile adminMobile from ac_company cmp
         left join ac_account_company accmp on accmp.company_id=cmp.id
         left join ac_account ac on ac.id = accmp.account_id
         left join ac_account aci on aci.id = cmp.creator_id

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

@@ -209,7 +209,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                 dataIndex: 'pi_iocode',
                 width: 150
             },{
-                text: '关联验收序号号',
+                text: '关联验收序号',
                 dataIndex: 'iodetno',
                 width: 150
             },{

frontend/saas-web/app/view/stock/report/Prodiodetail.js

@@ -7,8 +7,8 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
 
     viewName: 'stock-report-prodiodetail',
   //  按物料分组
-    groupField: 'pr_detail',
-    groupHeaderTpl: '物料名称: {[values.rows[0].data.pr_detail]}',
+    groupField: 'pd_prodcode',
+    groupHeaderTpl: '物料: {[values.rows[0].data.pr_detail]}({[values.rows[0].data.pd_prodcode]})',
     listUrl: '/api/storage/report/prodioDetail',
     defaultCondition: null,
     reportTitle: '物料出入库明细表',
@@ -63,14 +63,6 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         text: '单据类型',
         dataIndex: 'pi_class',
         width: 110
-    }, {
-        text: '客户/供应商编号',
-        dataIndex: 'bizcode',
-        width: 150
-    }, {
-        text: '客户/供应商名称',
-        dataIndex: 'bizname',
-        width: 250
     }, {
         text: '日期',
         dataIndex: 'pi_date',
@@ -142,6 +134,14 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         text: '备注',
         dataIndex: 'pd_remark',
         width: 250
+    }, {
+        text: '客户/供应商编号',
+        dataIndex: 'bizcode',
+        width: 150
+    }, {
+        text: '客户/供应商名称',
+        dataIndex: 'bizname',
+        width: 250
     }]
 
 });