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

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -45,7 +45,14 @@ public enum BizExceptionCode implements BaseExceptionCode {
     SALEOUT_POSTSTATUS_ERROR(72004,"当前单据状态无法进行此操作。"),
     SALEOUT_POST_ERROR(72005,""),
     SALEOUT_UNAUDIT_ERROR(72006,"销售订单已转出货单,无法反审核"),
+
     //资金
+    PAYBALANCE_OUTNOWBALANCE(74001,"本次核销金额不能大于未核销金额"),
+    PAYBALANCE_UNIQUESOURCECODE(74002, "保存失败！不能选择重复的源单"),
+
+    RECALANCE_OUTNOWBALANCE(74003,"本次核销金额不能大于未核销金额"),
+
+
 
     //库存
     EMPTY_DATA(76100,"数据为空,请填写后再保存"),

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

@@ -292,31 +292,17 @@
       bk_remark = #{bkRemark,jdbcType=LONGVARCHAR}
     where bk_id = #{bkId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
+  <update id="updateBankcode">
     update bankinformation
-    set bk_bankcode = #{bkBankcode,jdbcType=VARCHAR},
-      bk_bankname = #{bkBankname,jdbcType=VARCHAR},
-      bk_date = #{bkDate,jdbcType=TIMESTAMP},
-      bk_type = #{bkType,jdbcType=VARCHAR},
-      bk_beginamount = #{bkBeginamount,jdbcType=DOUBLE},
-      bk_thisamount = #{bkThisamount,jdbcType=DOUBLE},
-      bk_status = #{bkStatus,jdbcType=VARCHAR},
-      bk_statuscode = #{bkStatuscode,jdbcType=VARCHAR},
-      bk_recorderid = #{bkRecorderid,jdbcType=INTEGER},
-      bk_recorder = #{bkRecorder,jdbcType=VARCHAR},
-      bk_recorddate = #{bkRecorddate,jdbcType=TIMESTAMP},
-      bk_ym = #{bkYm,jdbcType=INTEGER},
-      companyid = #{companyId,jdbcType=INTEGER},
-      updaterId = #{updaterId,jdbcType=INTEGER},
-      updateTime = #{updateTime,jdbcType=TIMESTAMP},
-      bk_text1 = #{bkText1,jdbcType=VARCHAR},
-      bk_text2 = #{bkText2,jdbcType=VARCHAR},
-      bk_text3 = #{bkText3,jdbcType=VARCHAR},
-      bk_text4 = #{bkText4,jdbcType=VARCHAR},
-      bk_text5 = #{bkText5,jdbcType=VARCHAR}
-    where bk_id = #{bk_id,jdbcType=INTEGER}
+    set bk_thisamount = nvl(#{bk_thisamount,jdbcType=DOUBLE},0) ${symbol} #{nowbalance}
+    where bk_bankcode = #{bankcode,jdbcType=VARCHAR}
   </update>
 
+  <select id="selectThisamount" resultMap="java.lang.Double" parameterType="com.usoftchina.saas.document.entities.Bankinformation">
+   select bk_thisamount from bankinformation
+    where bk_bankcode = #{bankcode,jdbcType=VARCHAR}
+  </select>
+
   <select id="selectAll" resultMap="BaseResultMap">
     SELECT * FROM bankinformation
   </select>

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthreceiptsServiceImpl.java

@@ -10,6 +10,7 @@ import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.document.mapper.BankinformationMapper;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.money.mapper.BanksubledgerMapper;
 import com.usoftchina.saas.money.mapper.OthreceiptsMapper;
@@ -39,6 +40,8 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
     private MaxnumberService maxnumberService;
     @Autowired
     private BanksubledgerMapper banksubledgerMapper;
+    @Autowired
+    private BankinformationMapper bankinformationMapper;
 
     @Override
     public DocBaseDTO insert(Othte othte) {
@@ -72,7 +75,7 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
             othreceiptsdetail1.setOrd_orid(Math.toIntExact(id));
             othreceiptsdetail1.setCompanyId(BaseContextHolder.getCompanyId());
             if (othreceiptsdetail1.getId() > 0 ){
-                othreceiptsdetailMapper.updateByPrimaryKey(othreceiptsdetail1);
+                othreceiptsdetailMapper.updateByPrimaryKeySelective(othreceiptsdetail1);
             }else {
                 othreceiptsdetailMapper.insertSelective(othreceiptsdetail1);
             }
@@ -94,6 +97,16 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
         }else {
             othreceiptsMapper.updateByPrimaryKeySelective(othreceipts);
         }
+
+        Double amount = bankinformationMapper.selectThisamount(othreceipts.getOr_bankcode());
+        //取从表金额
+        List<Othreceiptsdetail> othreceiptsdetailList = othte.getItems();
+        Iterator isList = othreceiptsdetailList.iterator();
+        while (isList.hasNext()){
+            Othreceiptsdetail othreceiptsdetail = (Othreceiptsdetail) isList.next();
+            bankinformationMapper.updateBankcode(amount, othreceiptsdetail.getOrd_nowbalance(),
+                    othreceipts.getOr_bankcode(), "+");
+        }
     }
 
     @Override
@@ -107,6 +120,17 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
         //删除中间表
         othreceipts = othreceiptsMapper.selectByPrimaryKey(id);
         banksubledgerMapper.deleteByPrimaryKey(othreceipts.getOr_code(), "其他收入单");
+
+        //更新资金
+        Double amount = bankinformationMapper.selectThisamount(othreceipts.getOr_bankcode());
+        List<Othreceiptsdetail> othreceiptsdetailList = othreceiptsdetailMapper.selectByPrimaryKey(id);
+        Iterator isList = othreceiptsdetailList.iterator();
+        while (isList.hasNext()){
+            Othreceiptsdetail othreceiptsdetail = (Othreceiptsdetail) isList.next();
+            bankinformationMapper.updateBankcode(amount, othreceiptsdetail.getOrd_nowbalance(),
+                    othreceipts.getOr_bankcode(), "-");
+        }
+
     }
 
 
@@ -163,7 +187,8 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
             othreceipts.setOr_statuscode(Status.AUDITED.name());
             Othte othte = this.select(Math.toIntExact(othreceipts.getId()));
             this.changBankUntil(othte);
-            othreceiptsMapper.updateByPrimaryKeySelective(othreceipts);
+            this.insert(othte);
+//            othreceiptsMapper.updateByPrimaryKeySelective(othreceipts);
         }
     }
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -58,6 +59,9 @@ public class PaybalanceServiceImpl implements PaybalanceService {
 
         Long rbId = paybalance.getId();
 
+        //校验数据
+        checkPaybalance(pay);
+
         if (paybalance.getId() > 0){
             paybalanceMapper.updateByPrimaryKeySelective(paybalance);
         }else {
@@ -93,6 +97,63 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         return new DocBaseDTO(rbId, pb_code, BillCodeSeq.PAYBALANCE.getCaller());
     }
 
+    /**
+     * 校验数据
+     * @param pay
+     * @author hx
+     */
+    private void checkPaybalance(Pay pay){
+        Paybalance paybalance = pay.getMain();
+        List<Paybalancedet> paybalancedet = pay.getItems1();
+        List<Paybalancedetail> paybalancedetail = pay.getItems2();
+        //本次核销合计
+        Double nowbalanceTotal = new Double(0);
+        for(Paybalancedetail detail : paybalancedetail){
+            //本次核销金额
+            Double nowbalance = detail.getPbd_nowbalance();
+            nowbalanceTotal = nowbalanceTotal + nowbalance;
+            //来源单号
+            Integer sourceId = detail.getPbd_slid();
+            //未核销金额
+            Double namount = new Double(0);
+            if(sourceId!=0){
+                Subledger subledger = subledgerMapper.selectByPrimaryKey(sourceId);
+                namount = subledger.getSl_namount();
+            }
+            //本次核销金额不能大于未核销金额
+            if(nowbalance>namount){
+                throw new BizException(500, BizExceptionCode.PAYBALANCE_OUTNOWBALANCE.getMessage());
+            }
+            //单据金额
+            Double amount = detail.getPbd_amount();
+            if(amount>0 && nowbalance<0){
+                String error = "单据类型为" + detail.getPbd_slkind() + "的单据,核销金额必须为正数";
+                throw new BizException(500, error);
+            }
+            if(amount<0 && nowbalance>0){
+                String error = "单据类型为" + detail.getPbd_slkind() + "的单据,核销金额必须为负数";
+                throw new BizException(500, error);
+            }
+        }
+        //不能选择重复的源单
+        for  ( int  i  =   0 ; i  <  paybalancedetail.size()  -   1 ; i ++ )  {
+            for  ( int  j  =  paybalancedetail.size()  -   1 ; j  >  i; j -- )  {
+                if  (paybalancedetail.get(j).getPbd_slcode().equals(paybalancedetail.get(i).getPbd_slcode()))  {
+                    throw new BizException(500, BizExceptionCode.PAYBALANCE_UNIQUESOURCECODE.getMessage());
+                }
+            }
+        }
+        //付款金额合计
+        Double amountTotal = new Double(0);
+        for (Paybalancedet det: paybalancedet) {
+            amountTotal = amountTotal + det.getPd_amount();
+        }
+        //更新本次预付款金额
+        Paybalance updatePay = new Paybalance();
+        updatePay.setId(paybalance.getId());
+        updatePay.setPb_preamount(amountTotal+paybalance.getPb_discounts()-nowbalanceTotal);
+        paybalanceMapper.updateByPrimaryKeySelective(updatePay);
+    }
 
     @Override
     public void audit(Pay pay) {
@@ -115,6 +176,19 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         }else {
             paybalanceMapper.updateByPrimaryKeySelective(paybalance);
         }
+
+        Paybalance updatePay = new Paybalance();
+        List<Paybalancedet> paybalancedet = pay.getItems1();
+        List<Paybalancedetail> paybalancedetail = pay.getItems2();
+        //更新主表付款金额:pb_pdamount=从表一金额合计
+        Double amountTotal = new Double(0);
+        for (Paybalancedet det: paybalancedet) {
+            amountTotal = amountTotal + det.getPd_amount();
+        }
+        updatePay.setId(pay.getMain().getId());
+        updatePay.setPb_pdamount(amountTotal);
+        //updateByPrimaryKeySelective
+
     }
 
     @Override
@@ -129,6 +203,13 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         paybalance = paybalanceMapper.selectByPrimaryKey(id);
         subledgerMapper.deleteByPrimaryKey(paybalance.getPb_code(), paybalance.getPb_kind());
         banksubledgerMapper.deleteByPrimaryKey(paybalance.getPb_code(), paybalance.getPb_kind());
+
+        //更新供应商资料
+        /**
+         * ve_preamount=nvl(ve_preamount,0)-pb_preamount,
+         * ve_payamount=nvl(ve_payamount,0)+pb_pbdamount,
+         * ve_leftamount=ve_beginapamount-e_beginprepayamount+ve_payamount-ve_preamount;
+         */
     }
 
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java

@@ -56,6 +56,9 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         //单号赋值
         recbalance.setRb_code(pu_code);
 
+        //校验数据
+        checkRecbalance(rec);
+
         Long rbId = recbalance.getId();
         if (rbId > 0){
             recbalanceMapper.updateByPrimaryKeySelective(recbalance);
@@ -93,6 +96,63 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         return new DocBaseDTO(rbId, pu_code, BillCodeSeq.RECBALANCE.getCaller());
     }
 
+    /**
+     * 校验数据
+     * @param pay
+     */
+    private void checkRecbalance(Rec rec){
+        Recbalance recbalance = rec.getMain();
+        List<Recbalancedet> recbalancedet = rec.getItems1();
+        List<Recbalancedetail> recbalancedetail = rec.getItems2();
+        //本次核销合计
+        Double nowbalanceTotal = new Double(0);
+        for(Recbalancedetail detail : recbalancedetail){
+            //本次核销金额
+            Double nowbalance = detail.getRbd_nowbalance();
+            nowbalanceTotal = nowbalanceTotal + nowbalance;
+            //来源单号
+            Integer sourceId = detail.getRbd_slid();
+            //未核销金额
+            Double namount = new Double(0);
+            if(sourceId!=0){
+                Subledger subledger = subledgerMapper.selectByPrimaryKey(sourceId);
+                namount = subledger.getSl_namount();
+            }
+            //本次核销金额不能大于未核销金额
+            if(nowbalance>namount){
+                throw new BizException(500, BizExceptionCode.RECALANCE_OUTNOWBALANCE.getMessage());
+            }
+            //单据金额
+            Double amount = detail.getRbd_amount();
+            if(amount>0 && nowbalance<0){
+                String error = "单据类型为" + detail.getRbd_slkind() + "的单据,核销金额必须为正数";
+                throw new BizException(500, error);
+            }
+            if(amount<0 && nowbalance>0){
+                String error = "单据类型为" + detail.getRbd_slkind() + "的单据,核销金额必须为负数";
+                throw new BizException(500, error);
+            }
+        }
+        //不能选择重复的源单
+        for  ( int  i  =   0 ; i  <  recbalancedetail.size()  -   1 ; i ++ )  {
+            for  ( int  j  =  recbalancedetail.size()  -   1 ; j  >  i; j -- )  {
+                if  (recbalancedetail.get(j).getRbd_slcode().equals(recbalancedetail.get(i).getRbd_slcode()))  {
+                    throw new BizException(500, BizExceptionCode.PAYBALANCE_UNIQUESOURCECODE.getMessage());
+                }
+            }
+        }
+        //付款金额合计
+        Double amountTotal = new Double(0);
+        for (Recbalancedet det: recbalancedet) {
+            amountTotal = amountTotal + det.getRd_amount();
+        }
+        //更新本次预付款金额
+        Recbalance updatePay = new Recbalance();
+        updatePay.setId(recbalance.getId());
+        updatePay.setRb_preamount(amountTotal+recbalance.getRb_discounts()-nowbalanceTotal);
+        recbalanceMapper.updateByPrimaryKeySelective(updatePay);
+    }
+
     @Override
     public void delete(int id) {
         recbalanceMapper.deleteByPrimaryKey(id);
@@ -142,6 +202,18 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         }else {
             recbalanceMapper.updateByPrimaryKeySelective(recbalance);
         }
+
+        Recbalance updatePay = new Recbalance();
+        List<Recbalancedet> recbalancedet = rec.getItems1();
+        List<Recbalancedetail> recbalancedetail = rec.getItems2();
+        //更新主表付款金额:pb_pdamount=从表一金额合计
+        Double amountTotal = new Double(0);
+        for (Recbalancedet det: recbalancedet) {
+            amountTotal = amountTotal + det.getRd_amount();
+        }
+        updatePay.setId(rec.getMain().getId());
+        updatePay.setRb_rdamount(amountTotal);
+        //updateByPrimaryKeySelective
     }
 
     @Override

applications/money/money-server/src/main/resources/mapper/BanksubledgerMapper.xml

@@ -107,7 +107,7 @@
         from banksubledger
         where bl_id = #{bl_id,jdbcType=INTEGER}
     </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from banksubledger
     where bl_id = #{code,jdbcType=VARCHAR} and bl_kind = #{kind, jdbcType=VARCHAR}
   </delete>

applications/money/money-server/src/main/resources/mapper/PaybalancedetailMapper.xml

@@ -234,4 +234,13 @@
     </set>
     where pbd_id = #{id,jdbcType=INTEGER}
   </update>
+  <!--<resultMap id="statistics_sourcecode" type="com.usoftchina.saas.money.po.PaybalanceSourceCode">-->
+    <!--<result column="countNum" property="countNum" jdbcType="INTEGER"></result>-->
+    <!--<result column="pbd_slcode" property="pbd_slcode" jdbcType="INTEGER"></result>-->
+  <!--</resultMap>-->
+  <!--<select id="checkPaybalanceDetailCodeUnique" resultMap="statistics_sourcecode" parameterType="java.lang.Long" >-->
+    <!--select count(1) as countNum,pbd_slcode from paybalancedetail-->
+    <!--where pbd_pbid = #{id,jdbcType=Long}-->
+    <!--GROUP BY pbd_slcode having count(1)>1-->
+  <!--</select>-->
 </mapper>

applications/money/money-server/src/main/resources/mapper/SubledgerMapper.xml

@@ -31,7 +31,7 @@
     from subledger
     where sl_id = #{sl_id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from subledger
     where sl_code = #{code,jdbcType=VARCHAR} and sl_kind = #{kind, jdbcType=VARCHAR}
   </delete>

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/ProdInOutServiceImpl.java

@@ -134,7 +134,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             setTotal(prodInOutNow);
             baseDTO = getBaseDTOById(pi_id,pi_class,pi_inoutno);
             //日志记录
-            //messageLogService.save(baseDTO);
+            messageLogService.save(baseDTO);
             return baseDTO;
         }
         //更新操作
@@ -168,7 +168,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //更新明细金额等
         setTotal(prodInOutNow);
         //日志
-       //messageLogService.update(baseDTO);
+       messageLogService.update(baseDTO);
         return baseDTO;
 
     }
@@ -193,7 +193,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //更新明细金额等
         setTotal(prodInOut);
         //日志
-      //messageLogService.deleteDetail(docBaseDTO);
+      messageLogService.deleteDetail(docBaseDTO);
     }
 
     @Override
@@ -205,7 +205,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         setTotal(prodInOut);
         DocBaseDTO docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class(),prodInOut.getPi_inoutno());
         //日志
-       //messageLogService.deleteDetail(docBaseDTO);
+       messageLogService.deleteDetail(docBaseDTO);
         return num;
     }
 
@@ -264,7 +264,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             //记录日志
             DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,pi_inoutno);
             //日志
-           //messageLogService.audit(docBaseDTO);
+           messageLogService.audit(docBaseDTO);
         }
     }
     @Override
@@ -316,7 +316,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             //记录日志
             DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,pi_inoutno);
             //日志
-            //messageLogService.unAudit(docBaseDTO);
+            messageLogService.unAudit(docBaseDTO);
         }
     }
 
@@ -406,8 +406,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         ProdInOut targetPi = new ProdInOut();
         //生成单号
         String piInoutno  =
-                //maxnumberService.getMaxnumber(BillCodeSeq.SALEIN.getCaller(),true).getData();
-                BillCodeSeq.SALEIN.getCaller()+Math.abs(Math.random()*100);
+                maxnumberService.getMaxnumber(BillCodeSeq.SALEIN.getCaller(),true).getData();
+               // BillCodeSeq.SALEIN.getCaller()+Math.abs(Math.random()*100);
 
         //设置公司id
         targetPi.setCompanyId(sourcePi.getCompanyId());
@@ -479,7 +479,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
 
         //日志记录
         DocBaseDTO baseDTO = new DocBaseDTO(pi_id, piInoutno, BillCodeSeq.SALEIN.getName());
-        //messageLogService.customizeLog(baseDTO, Operation.TURNPRODOUTRETURN);
+        messageLogService.customizeLog(baseDTO, Operation.TURNPRODOUTRETURN);
         return baseDTO;
 
     }
@@ -500,7 +500,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodInOutMapper.updateByPrimaryKeySelective(prodInOut);
         //记录日志
         DocBaseDTO docBaseDTO = getBaseDTOById(prodInOut.getId(),prodInOut.getPi_class(),prodInOut.getPi_inoutno());
-        //messageLogService.close(docBaseDTO);
+        messageLogService.close(docBaseDTO);
         return docBaseDTO;
     }
 
@@ -535,7 +535,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodInOutMapper.updateByPrimaryKeySelective(prodInOut);
         //记录日志
         DocBaseDTO docBaseDTO = getBaseDTOById(prodInOut.getId(),prodInOut.getPi_class(),prodInOut.getPi_inoutno());
-        //messageLogService.open(docBaseDTO);
+        messageLogService.open(docBaseDTO);
         return docBaseDTO;
     }
 
@@ -578,8 +578,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         }else {//销售退货单
             caller = BillCodeSeq.SALEIN.getCaller();
         }
-        return code;
-                //maxnumberService.pushMaxnubmer(count, code, caller).getData();
+        return //code;
+                maxnumberService.pushMaxnubmer(count, code, caller).getData();
     }
 
     /**

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

@@ -76,25 +76,25 @@
 
 
   <select id="selectProdInOutListByCondition" resultMap="BaseResultMap">
-    select  *  from prodinout left join prodiodetail on pi_id = pd_piid
+    select  *  from prodinout
     <where>
       <if test="con != null">
         ${con}
       </if>
       <if test="companyId != null">
-        and   prodinout.companyId = #{companyId}
-      </if> order by pi_date desc,pi_id desc,pd_pdno
+        and companyId = #{companyId}
+      </if> order by pi_date desc,pi_id desc
     </where>
   </select>
 
   <select id="selectProdInOutBycondition"  resultMap="BaseResultMap">
-    select  *  from prodinout
+    select  *  from prodinout left join prodiodetail on pi_id = pd_piid left join product on pr_id = pd_prodid
       <where>
         <if test="con != null">
           ${con}
         </if>
         <if test="companyId != null">
-          and  companyId = #{companyId}
+          and  prodinout.companyId = #{companyId}
         </if>
       </where>
       order by pi_id desc

frontend/saas-web/app.json

@@ -20,7 +20,8 @@
         "font-awesome",
         "ux",
         "modern-locale",
-        "charts"
+        "charts",
+        "font-saas"
     ],
     "locale":"zh_CN",
 

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -126,7 +126,10 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 },
                 items: ['->', {
                     text: '新增',
-                    handler: 'onAddClick'
+                    handler: 'onAddClick',
+                    bind: {
+                        hidden: '{!addEnable}'
+                    }
                 }, {
                     text: '审核',
                     xtype: 'button',
@@ -144,6 +147,9 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 this.hide();
                             } 
                         }
+                    },
+                    bind: {
+                        hidden: '{!auditEnable}'
                     }
                 }, {
                     text: '打印',
@@ -162,6 +168,9 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 this.hide();
                             } 
                         }
+                    },
+                    bind: {
+                        hidden: '{!printEnable}'
                     }
                 }, {
                     text: '导入',
@@ -180,6 +189,9 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 this.hide();
                             } 
                         }
+                    },
+                    bind: {
+                        hidden: '{!importEnable}'
                     }
                 },{
                     text: '关闭',
@@ -198,10 +210,16 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 this.hide();
                             } 
                         }
+                    },
+                    bind: {
+                        hidden: '{!closeEnable}'
                     }
                 }, {
                     text: '删除',
-                    handler: me.onDelete
+                    handler: me.onDelete,
+                    bind: {
+                        hidden: '{!deleteEnable}'
+                    }
                 }]
             }, {
                 xtype: 'pagingtoolbar',

frontend/saas-web/app/view/core/query/QueryPanelModel.js

@@ -4,5 +4,11 @@ Ext.define('saas.view.core.query.QueryPanelModel', {
 
     data: {
         form: {}, // 查询字段记录
+        addEnable: true, // 显示新增按钮
+        auditEnable: true, // 显示审核按钮
+        printEnable: true, // 显示打印按钮
+        importEnable: true, // 显示导入按钮
+        closeEnable: true, // 显示关闭按钮
+        deleteEnable: true // 显示删除按钮
     }
 });

frontend/saas-web/app/view/home/Home.scss

@@ -89,4 +89,45 @@ $unaudit-purc-container-color: dynamic(#e91e63);
     content: "";
     top: 0;
     left: 0
+}
+
+.x-responsivecolumn {
+    padding: 0;
+}
+
+.big-100 {
+    @include responsivecolumn-item(100%);
+}
+
+.big-60 {
+    @include responsivecolumn-item(60%);
+}
+
+.big-50 {
+    @include responsivecolumn-item(50%);
+}
+
+.big-40 {
+    @include responsivecolumn-item(40%);
+}
+
+.big-33 {
+    @include responsivecolumn-item(33.33%);
+}
+
+.big-20 {
+    @include responsivecolumn-item(20%);
+}
+
+//--------------------------------------------------------
+// And classes for small-size responsive items
+
+ .x-responsivecolumn-small {
+     > .small-100 {
+         @include responsivecolumn-item(100%);
+     }
+
+     > .small-50 {
+         @include responsivecolumn-item(50%);
+     }
 }

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -165,7 +165,6 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 dataIndex : "ftd_remark",
                 width : 120.0, 
                 items : null,
-                flex : 1.0,
                 editor : {
                     xtype : ""
                 }

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -72,8 +72,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         }, {
             text: '备注',
             dataIndex: 'ft_remark',
-            width: 250,
-            flex: 1
+            width: 250
         }],
         relativeColumn: []
     }

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -86,7 +86,6 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             text: '备注',
             dataIndex: 'os_remark',
             width: 250,
-            flex: 1
         }],
         relativeColumn: []
     }

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

@@ -51,7 +51,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     }, {
         xtype: "dbfindtrigger",
         name: "pb_vendname",
-        fieldLabel: "供应商名称"
+        fieldLabel: "供应商名称",
+        allowBlank : false
     },{
         xtype:"numberfield",
         name:"ve_leftamount",
@@ -74,11 +75,11 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         name: "pb_pbdamount",
         fieldLabel: "本次核销金额"
     }, {
-        xtype: "hidden",
+        xtype: "numberfield",
         name: "pb_preamount",
         fieldLabel: "本次预付款"
     }, {
-        xtype: 'hidden',
+        xtype: 'numberfield',
         name: 'pb_discounts',
         fieldLabel: '整单折扣'
     }, {
@@ -107,40 +108,17 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: '结算账户ID',
             dataIndex: 'pd_bankid',
-            xtype:'hidden'
+            hidden: true
         }, {
-        //     text: '结算账户编号',
-        //     dataIndex: 'paybalancedet'
-        // }, {
             text: '资金账户',
             dataIndex: 'pd_bankname',
-            editable:false,
             editor:{
-                xtype : "remotecombo",
-                storeUrl:'/api/document/bankinformation/getCombo',
-                name : "bk_bankname",
-                allowBlank : false, //不能为空
-                columnWidth : 0.25,//布局
-                hiddenBtn:false,//true 则会关闭新增按钮功能
-                addHandler:function(b){
-                    var document = Ext.create('saas.view.document.kind.Kind',{});
-                    var form = this.ownerCmp.ownerCt;
-                    this.dialog = form.getController().getView().add({
-                        xtype: 'document-kind-childwin',
-                        bind: {
-                            title: '新增资金账户'
-                        },
-                        dataKind:'bankinformation',
-                        belong:document.etc['bankinformation'],
-                        _parent:form,
-                        _combo:this.ownerCmp,
-                        record:null,
-                        session: true
-                    });
-                    this.dialog.show();
-                }
+                xtype:'dbfindtrigger'
             }
-
+        },{
+            text: '资金账户编号',
+            dataIndex: 'pd_bankcode',
+            hidden: true
         }, {
             text: "付款金额",
             dataIndex: "pd_amount",
@@ -192,17 +170,18 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                 xtype: 'textfield'
             }
         }]
-    }, {
-        xtype:'dbfindtrigger',
-        columnWidth: 1,
-        fieldLabel:'选择源单',
-        name: 'choseSource'
     },{
         xtype: "detailGridField",
         storeModel: 'saas.model.money.PayBalance2',
         detnoColumn: 'pbd_detno',
         allowEmpty: true,
         deleteDetailUrl: '/api/money/paybalance/deleteDetail2/',
+        tbar: ['->', {
+            xtype:'dbfindtrigger',
+            columnWidth: 1,
+            fieldLabel:'选择源单',
+            name: 'choseSource'
+        }],
         columns: [{
             text: 'ID',
             dataIndex: 'id',
@@ -210,14 +189,27 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: '期间',
             dataIndex: 'pbd_ym',
-            xtype:'hidden'
+            hidden: true
         }, {
             text: '来源ID',
             dataIndex: 'pbd_slid',
-            xtype:'hidden'
+            hidden: true
         }, {
             text: '来源单号',
-            dataIndex: 'pbd_slcode'
+            dataIndex: 'pbd_slcode',
+            editor:{
+                displayField : "display",
+                editable : true,
+                format : "",
+                hideTrigger : false,
+                maxLength : 100.0,
+                minValue : null,
+                positiveNum : false,
+                queryMode : "local",
+                store : null,
+                valueField : "value",
+                xtype : "multidbfindtrigger"
+            }
         }, {
             text: "业务类型",
             dataIndex: "pbd_slkind",
@@ -321,7 +313,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             text: '备注',
             dataIndex: 'pbd_remark',
             width: 250,
-            xtype: 'hidden'
+            hidden: true
         }]
     }, {
         xtype: 'hidden',

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         addTitle: '供应商资料',
                         dbfinds: [{
                             from: 've_code',
-                            to: 'pd_vendcode'
+                            to: 'pb_vendcode'
                         }, {
                             from: 've_name',
                             to: 'pb_vendname'
@@ -87,7 +87,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
 
                 }
             },
-            'dbfindtrigger[name=choseSource]': {
+            'multidbfindtrigger[name=pbd_slcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/money/subledger/list',
@@ -112,7 +112,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             field: 'sl_code',
                             width: 100
                         }],
-                        defaultCondition: "sl_vendtid<>0 and sl_kind in ('期初余额','采购验收单','采购验退单') and sl_namount<>0",
+                        defaultCondition: "sl_vendid<>0 and sl_kind in ('期初余额','采购验收单','采购验退单') and sl_namount<>0",
                         dbSearchFields:[{
                             emptyText:'输入源单编号',
                             xtype : "textfield",
@@ -153,6 +153,61 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         }]
                     });
 
+                }
+            },
+            'dbfindtrigger[name=pd_bankname]':{
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dataUrl: '/api/document/bankinformation/list',
+                        // addXtype: 'document-banksubledger-formpanel',
+                        addTitle: '账户资料',
+                        dbfinds: [{
+                            from: 'id',
+                            to: 'pd_bankid'
+                        }, {
+                            from: 'bk_bankcode',
+                            to: 'pd_bankcode'
+                        },{
+                            from: 'bk_bankname',
+                            to: 'pd_bankname'
+                        }],
+                        dbtpls: [{
+                            field: 'bk_bankcode',
+                            width: 100
+                        }, {
+                            field: 'bk_bankname',
+                            width: 100
+                        }],
+                        defaultCondition: "1=1",
+                        dbSearchFields:[{
+                            emptyText:'输入账户名称或者编号',
+                            xtype : "textfield",
+                            name : "search",
+                            getCondition: function(v) {
+                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true,
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[{
+                            "text": "账户id",
+                            "hidden": true,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": "numbercolumn"
+                        },{
+                            "text": "账户编号",
+                            "flex": 1,
+                            "dataIndex": "bk_bankcode",
+                            "width": 100
+                        }, {
+                            "text": "账户名称",
+                            "flex": 1,
+                            "dataIndex": "bk_bankname",
+                            "width": 100
+                        }]
+                    });
+
                 }
             }
         });

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

@@ -111,32 +111,9 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             hidden: true
         }, {
             text: '资金账户',
-            dataIndex: 'pd_bankname',
-            editable:false,
+            dataIndex: 'rd_bankname',
             editor:{
-                xtype : "remotecombo",
-                storeUrl:'/api/document/bankinformation/getCombo',
-                name : "bk_bankname",
-                allowBlank : false, //不能为空
-                columnWidth : 0.25,//布局
-                hiddenBtn:false,//true 则会关闭新增按钮功能
-                addHandler:function(b){
-                    var document = Ext.create('saas.view.document.kind.Kind',{});
-                    var form = this.ownerCmp.ownerCt;
-                    this.dialog = form.getController().getView().add({
-                        xtype: 'document-kind-childwin',
-                        bind: {
-                            title: '新增资金账户'
-                        },
-                        dataKind:'bankinformation',
-                        belong:document.etc['bankinformation'],
-                        _parent:form,
-                        _combo:this.ownerCmp,
-                        record:null,
-                        session: true
-                    });
-                    this.dialog.show();
-                }
+                xtype:'dbfindtrigger'
             }
         }, {
             text: "收款金额",
@@ -189,16 +166,17 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                 xtype: 'textfield'
             }
         }]
-    },{
-        xtype:'dbfindtrigger',
-        columnWidth: 1,
-        fieldLabel:'选择源单',
-        name: 'choseSource'
     },{
         xtype: "detailGridField",
         storeModel: 'saas.model.money.RecBalance2',
         detnoColumn: 'rbd_detno',
         deleteDetailUrl: '/api/money/recbalance/deleteDetail2/',
+        tbar: ['->', {
+            xtype:'dbfindtrigger',
+            columnWidth: 1,
+            fieldLabel:'选择源单',
+            name: 'choseSource'
+        }],
         columns: [{
             text: 'ID',
             dataIndex: 'id',
@@ -219,7 +197,20 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             hidden: true
         }, {
             text: '来源单号',
-            dataIndex: 'rbd_slcode'
+            dataIndex: 'rbd_slcode',
+            editor:{
+                displayField : "display",
+                editable : true,
+                format : "",
+                hideTrigger : false,
+                maxLength : 100.0,
+                minValue : null,
+                positiveNum : false,
+                queryMode : "local",
+                store : null,
+                valueField : "value",
+                xtype : "multidbfindtrigger"
+            }
         }, {
             text: "业务类型",
             dataIndex: "rbd_slkind"

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

@@ -154,7 +154,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
 
                 }
             },
-            'dbfindtrigger[name=choseSource]': {
+            'multidbfindtrigger[name=rbd_slcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/money/subledger/list',
@@ -179,7 +179,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             field: 'sl_code',
                             width: 100
                         }],
-                        defaultCondition: "sl_vendtid<>0 and sl_kind in ('期初余额','采购验收单','采购验退单') and sl_namount<>0",
+                        defaultCondition: "sl_vendid<>0 and sl_kind in ('期初余额','采购验收单','采购验退单') and sl_namount<>0",
                         dbSearchFields:[{
                             emptyText:'输入源单编号',
                             xtype : "textfield",
@@ -220,6 +220,61 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         }]
                     });
 
+                }
+            },
+            'dbfindtrigger[name=rd_bankname]':{
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dataUrl: '/api/document/bankinformation/list',
+                        // addXtype: 'document-banksubledger-formpanel',
+                        addTitle: '账户资料',
+                        dbfinds: [{
+                            from: 'id',
+                            to: 'rd_bankid'
+                        }, {
+                            from: 'bk_bankcode',
+                            to: 'rd_bankcode'
+                        },{
+                            from: 'bk_bankname',
+                            to: 'rd_bankname'
+                        }],
+                        dbtpls: [{
+                            field: 'bk_bankcode',
+                            width: 100
+                        }, {
+                            field: 'bk_bankname',
+                            width: 100
+                        }],
+                        defaultCondition: "1=1",
+                        dbSearchFields:[{
+                            emptyText:'输入账户名称或者编号',
+                            xtype : "textfield",
+                            name : "search",
+                            getCondition: function(v) {
+                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true,
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[{
+                            "text": "账户id",
+                            "hidden": true,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": "numbercolumn"
+                        },{
+                            "text": "账户编号",
+                            "flex": 1,
+                            "dataIndex": "bk_bankcode",
+                            "width": 100
+                        }, {
+                            "text": "账户名称",
+                            "flex": 1,
+                            "dataIndex": "bk_bankname",
+                            "width": 100
+                        }]
+                    });
+
                 }
             }
         });

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

@@ -70,7 +70,6 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             dataIndex: 'rb_rdamount',
             xtype: 'numbercolumn',
             width: 120,
-            flex: 1,
             hidden: true
         }]
     }

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

@@ -132,7 +132,19 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             text: '总额',
             dataIndex: 'pu_total',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 120
+        },{
+            text: '制单人',
+            dataIndex: 'pu_recorder',
+            width: 120
+        },{
+            text: '审核人',
+            dataIndex: 'pu_auditman',
+            width: 120
+        },{
+            text: '关联销售单',
+            dataIndex: 'pu_salecode',
+            width: 120
         }],
         relativeColumn: [{
             text: 'id',

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

@@ -1,5 +1,7 @@
 Ext.define('saas.view.purchase.purchase.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.purchase-purchase-querypanel'
-
+    alias: 'viewmodel.purchase-purchase-querypanel',
+    data: {
+        closeEnable:false
+    }
 });

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

@@ -110,6 +110,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             from:'pr_whcode',to:'pd_whcode'
                         },{
                             from:'pr_whname',to:'pd_whname'
+                        },{
+                            from:'pr_purcprice',to:'pd_orderprice'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100

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

@@ -112,50 +112,47 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
+            hidden:true,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
             dataIndex: 'pi_inoutno',
             width: 200
-        }, {
-            text: '单据状态',
-            dataIndex: 'pi_status',
-            width: 120
-        }, {
+        },{
             text: '单据类型',
             dataIndex: 'pi_class',
             width: 120
-        }, {
-            text: '下单日期',
+        },{
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200
         },{
-            text: '采购单号',
-            dataIndex: 'pi_pucode',
-            width: 200
+            text: '状态',
+            dataIndex: 'pi_status',
+            width: 120
         },{
             text: '供应商名称',
             dataIndex: 'pi_vendname',
             width: 120
         },{
-            text: '含税金额',
-            dataIndex: 'pi_total',
-            xtype:'numbercolumn',
+            text: '制单人',
+            dataIndex: 'pi_recordman',
             width: 120
         },{
-            text: '未税金额',
-            dataIndex: 'pi_nettotal',
-            xtype:'numbercolumn',
-            width: 120,
-            flex: 1
+            text: '审核人',
+            dataIndex: 'pi_auditman',
+            width: 120
+        },{
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 200
         }],
         relativeColumn: [{
             text: 'id',
             dataIndex: 'pu_id',
-            width: 0,
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            hidden:true
         }, {
             text: '单据编号',
             dataIndex: 'pd_inoutno',
@@ -210,8 +207,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             text: '成本单价',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 120,
-            flex: 1
+            width: 120
         }]
     }
 });

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

@@ -1,5 +1,7 @@
 Ext.define('saas.view.purchase.purchaseIn.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.purchase-purchasein-querypanel'
-
+    alias: 'viewmodel.purchase-purchasein-querypanel',
+    data: {
+        closeEnable:false
+    }
 });

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

@@ -109,6 +109,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             from:'pr_whcode',to:'pd_whcode'
                         },{
                             from:'pr_whname',to:'pd_whname'
+                        },,{
+                            from:'pr_purcprice',to:'pd_orderprice'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100

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

@@ -112,44 +112,41 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
+            hidden:true,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
             dataIndex: 'pi_inoutno',
             width: 200
-        }, {
-            text: '单据状态',
-            dataIndex: 'pi_status',
-            width: 120
-        }, {
+        },{
             text: '单据类型',
             dataIndex: 'pi_class',
             width: 120
-        }, {
-            text: '下单日期',
+        },{
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200
         },{
-            text: '采购单号',
-            dataIndex: 'pi_pucode',
-            width: 200
+            text: '状态',
+            dataIndex: 'pi_status',
+            width: 120
         },{
             text: '供应商名称',
             dataIndex: 'pi_vendname',
             width: 120
         },{
-            text: '含税金额',
-            dataIndex: 'pi_total',
-            xtype:'numbercolumn',
+            text: '制单人',
+            dataIndex: 'pi_recordman',
             width: 120
         },{
-            text: '未税金额',
-            dataIndex: 'pi_nettotal',
-            xtype:'numbercolumn',
-            width: 120,
-            flex: 1
+            text: '审核人',
+            dataIndex: 'pi_auditman',
+            width: 120
+        },{
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 200
         }],
         relativeColumn: [{
             text: 'id',
@@ -211,7 +208,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
             width: 120,
-            flex: 1
         }]
     }
 });

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

@@ -1,5 +1,8 @@
 Ext.define('saas.view.purchase.purchaseOut.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.purchase-purchaseout-querypanel'
+    alias: 'viewmodel.purchase-purchaseout-querypanel',
+    data: {
+        closeEnable:false
+    }
 
 });

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

@@ -115,7 +115,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 allowBlank:false, 
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8,
+                    decimalPrecision: 3,
                     minValue:0
                 },
                 renderer : function(v) {

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                             {
-                                from:'id',to:'sa_custid'
+                                from:'id',to:'sa_custid',ignore:true
                             },{
                                 from:'cu_code',to:'sa_custcode'
                             },{
@@ -113,7 +113,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         addTitle: '物料资料',
                         dbfinds:[
                         {
-                            from:'pr_code',to:'sd_prodcode'
+                            from:'pr_code',to:'sd_prodcode',ignore:true
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }, {

frontend/saas-web/app/view/sale/sale/QueryPanel.js

@@ -16,6 +16,11 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         xtype: 'textfield',
         name: 'sa_code',
         fieldLabel: '销售编号'
+    }, {
+        xtype: 'condatefield',
+        name: 'sa_recorddate',
+        fieldLabel: '单据日期',
+        columnWidth: 0.5
     }, {
         xtype: 'hidden',
         name: 'sa_custcode',

frontend/saas-web/app/view/sale/sale/QueryPanelController.js

@@ -11,8 +11,9 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                         dataUrl:'/api/document/customer/dbfind',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
+                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[{
-                            from:'cu_id',to:'sa_custid'
+                            from:'cu_id',to:'sa_custid',ignore:true
                         },{
                             from:'cu_code',to:'sa_custcode'
                         },{
@@ -23,38 +24,79 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                         },{
                             field:'cu_name',width:100
                         }],
-                        dbColumns:[{
-                            conditionCode:'cu_id',
-                            "text": "客户ID",
-                            "flex": 0,
-                            "dataIndex": "cu_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            conditionCode:'cu_code',
-                            "text": "客户编号",
-                            "flex": 1,
-                            "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'cu_name',
-                            "text": "客户名称",
-                            "flex": 1,
-                            "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'cu_type',
-                            "text": "客户类型",
-                            "flex": 0,
-                            "dataIndex": "cu_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
+                        dbSearchFields:[{
+                            emptyText:'输入客户编号或客户名称',
+                            xtype : "textfield", 
+                            name : "search", 
+                            getCondition: function(v) {
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[
+                            {
+                                conditionCode:'id',
+                                "text": "客户ID",
+                                "flex": 0,
+                                "dataIndex": "id",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            },{
+                                conditionCode:'cu_code',
+                                "text": "客户编号",
+                                "flex": 1,
+                                "dataIndex": "cu_code",
+                                "width": 100,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                conditionCode:'cu_name',
+                                "text": "客户名称",
+                                "flex": 1,
+                                "dataIndex": "cu_name",
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                conditionCode:'cu_type',
+                                "text": "客户类型",
+                                "flex": 1,
+                                "dataIndex": "cu_type",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "业务员编号",
+                                "flex": 1,
+                                "dataIndex": "cu_sellercode",
+                                "width": 100
+                            }, {
+                                "text": "业务员",
+                                "flex": 1,
+                                "dataIndex": "cu_sellername",
+                                "width": 100
+                            }, {
+                                "text": "税率",
+                                "flex": 1,
+                                "dataIndex": "cu_taxrate",
+                                "width": 100
+                            }, {
+                                "text": "承付天数",
+                                "flex": 1,
+                                "dataIndex": "cu_promisedays",
+                                "width": 100
+                            }, {
+                                "text": "额度",
+                                "flex": 1,
+                                "dataIndex": "cu_credit",
+                                "width": 100
+                            }, {
+                                "text": "客户地址",
+                                "flex": 1,
+                                "dataIndex": "ca_address",
+                                "width": 250
+                            }]
                     }) ;   
 
                 }

frontend/saas-web/app/view/sale/saleIn/FormPanel.js

@@ -239,8 +239,13 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
     }, {
         xtype : "textfield", 
         name : "pi_total", 
-        fieldLabel : "总额", 
+        fieldLabel : "单据金额", 
         readOnly: true
+    }, {
+        xtype : "textfield", 
+        name : "pi_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 0.75
     }, {
         xtype : "textfield", 
         name : "pi_recordman", 

frontend/saas-web/app/view/sale/saleIn/FormPanelController.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                             {
-                                from:'id',to:'pi_custid'
+                                from:'id',to:'pi_custid',ignore:true
                             },{
                                 from:'cu_code',to:'pi_custcode'
                             },{
@@ -112,7 +112,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         addTitle: '物料资料',
                         dbfinds:[
                         {
-                            from:'id',to:'pd_prodid'
+                            from:'id',to:'pd_prodid',ignore:true
                         },
                         {
                             from:'pr_code',to:'pd_prodcode'
@@ -210,7 +210,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         addXtype: 'other-storeinformation',
                         addTitle: '仓库资料',
                         dbfinds:[{
-                            from:'id',to:'pd_whid',
+                            from:'id',to:'pd_whid',ignore:true
                         }, { 
                             from:'wh_code',to:'pd_whcode'
                         }, {
@@ -221,6 +221,18 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         },{
                             field:'wh_description',width:100
                         }],
+                        defaultCondition: "wh_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(wh_code) like '%" + v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "仓库ID",
                             "flex": 0,

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -81,7 +81,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'pi_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {
@@ -97,10 +97,14 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '销售单号',
             dataIndex: 'pi_pucode',
             width: 200
-        },{
-            text: '客户名称',
-            dataIndex: 'pi_custname',
-            width: 120
+        }, {
+            xtype: 'hidden',
+            name: 'pi_custcode',
+            fieldLabel: '客户编号'
+        }, {
+            xtype: 'dbfindtrigger',
+            name: 'pi_custname',
+            fieldLabel: '客户名称'
         },{
             text: '含税金额',
             dataIndex: 'pi_total',
@@ -110,8 +114,11 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '未税金额',
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
-            width: 120,
-            flex: 1
+            width: 120
+        }, {
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 250
         }],
         relativeColumn: [{
             text: 'id',
@@ -172,8 +179,11 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '成本单价',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 120,
-            flex: 1
+            width: 120
+        }, {
+            text: '备注',
+            dataIndex: 'pd_remark',
+            width: 250
         }]
     }
 });

frontend/saas-web/app/view/sale/saleIn/QueryPanelController.js

@@ -11,53 +11,84 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                         dataUrl:'/api/document/customer/dbfind',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
+                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                         {
-                            from:'id',to:'pi_custid'
+                            from:'id',to:'pi_custid',ignore:true
                         },{
                             from:'cu_code',to:'pi_custcode'
                         },{
                             from:'cu_name',to:'pi_custname'
                         }],
-                        dbtpls:[
-                        {
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
+                        dbSearchFields:[{
+                            emptyText:'输入客户编号或客户名称',
+                            xtype : "textfield", 
+                            name : "search", 
+                            getCondition: function(v) {
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
                         }],
                         dbColumns:[
-                        {
-                            conditionCode:'id',
-                            "text": "客户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            conditionCode:'cu_code',
-                            "text": "客户编号",
-                            "flex": 1,
-                            "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'cu_name',
-                            "text": "客户名称",
-                            "flex": 1,
-                            "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'cu_type',
-                            "text": "客户类型",
-                            "flex": 0,
-                            "dataIndex": "cu_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
+                            {
+                                "text": "客户ID",
+                                "flex": 0,
+                                "dataIndex": "id",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            },{
+                                "text": "客户编号",
+                                "flex": 1,
+                                "dataIndex": "cu_code",
+                                "width": 100,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "客户名称",
+                                "flex": 1,
+                                "dataIndex": "cu_name",
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "客户类型",
+                                "flex": 1,
+                                "dataIndex": "cu_type",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "业务员编号",
+                                "flex": 1,
+                                "dataIndex": "cu_sellercode",
+                                "width": 100
+                            }, {
+                                "text": "业务员",
+                                "flex": 1,
+                                "dataIndex": "cu_sellername",
+                                "width": 100
+                            }, {
+                                "text": "税率",
+                                "flex": 1,
+                                "dataIndex": "cu_taxrate",
+                                "width": 100
+                            }, {
+                                "text": "承付天数",
+                                "flex": 1,
+                                "dataIndex": "cu_promisedays",
+                                "width": 100
+                            }, {
+                                "text": "额度",
+                                "flex": 1,
+                                "dataIndex": "cu_credit",
+                                "width": 100
+                            }, {
+                                "text": "客户地址",
+                                "flex": 1,
+                                "dataIndex": "ca_address",
+                                "width": 250
+                            }]
                     }) ;   
 
                 }
@@ -71,7 +102,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
+                            from:'pr_code',to:'pd_prodcode',ignore:true
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],

frontend/saas-web/app/view/sale/saleOut/FormPanel.js

@@ -244,8 +244,13 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     }, {
         xtype : "textfield", 
         name : "pi_total", 
-        fieldLabel : "总额", 
+        fieldLabel : "单据金额", 
         readOnly: true
+    }, {
+        xtype : "textfield", 
+        name : "pi_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 0.75
     }, {
         xtype : "textfield", 
         name : "pi_recordman", 

frontend/saas-web/app/view/sale/saleOut/FormPanelController.js

@@ -15,7 +15,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                         {
-                            from:'id',to:'pi_custid'
+                            from:'id',to:'pi_custid',ignore:true 
                         },{
                             from:'cu_code',to:'pi_custcode'
                         },{
@@ -108,9 +108,8 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
-                        dbfinds:[
-                        {
-                            from:'id',to:'pd_prodid'
+                        dbfinds:[{
+                            from:'id',to:'pd_prodid',ignore:true 
                         },
                         {
                             from:'pr_code',to:'pd_prodcode'
@@ -209,7 +208,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         addXtype: 'other-storeinformation',
                         addTitle: '仓库资料',
                         dbfinds:[{
-                            from:'id',to:'pd_whid',
+                            from:'id',to:'pd_whid',ignore:true 
                         }, { 
                             from:'wh_code',to:'pd_whcode'
                         }, {
@@ -220,6 +219,18 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         },{
                             field:'wh_description',width:100
                         }],
+                        defaultCondition: "wh_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(wh_code) like '%" + v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "仓库ID",
                             "flex": 0,

frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -31,12 +31,12 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         name: 'pi_custname',
         fieldLabel: '客户名称'
     }, {
-        xtype: 'hidden',
+        xtype: 'dbfindtrigger',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         showDetail: true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pr_detail',
         fieldLabel: '物料名称',
         showDetail: true
@@ -81,7 +81,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'pi_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         },{
@@ -111,11 +111,16 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
             width: 120
+        }, {
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 250,
+            flex:1
         }],
         relativeColumn: [{
             text: 'id',
-            dataIndex: 'pi_id',
-            width: 100,
+            dataIndex: 'id',
+            width: 0,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
@@ -176,8 +181,11 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             text: '成本单价',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 120,
-            flex: 1
+            width: 120
+        }, {
+            text: '备注',
+            dataIndex: 'pd_remark',
+            width: 250
         }]
     }
 });

frontend/saas-web/app/view/sale/saleOut/QueryPanelController.js

@@ -12,15 +12,16 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                         dataUrl:'/api/document/customer/dbfind',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
+                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                         {
-                            from:'id',to:'pi_custid'
+                            from:'id',to:'pi_custid',ignore:true
                         },{
                             from:'cu_code',to:'pi_custcode'
                         },{
                             from:'cu_name',to:'pi_custname'
                         },{
-                            from:'ca_address',to:'pi_address'
+                            from:'ca_address',to:'ca_address'
                         }],
                         dbtpls:[
                         {
@@ -28,9 +29,18 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                         },{
                             field:'cu_name',width:100
                         }],
+                        dbSearchFields:[{
+                            emptyText:'输入客户编号或客户名称',
+                            xtype : "textfield", 
+                            name : "search", 
+                            getCondition: function(v) {
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[
                             {
-                                conditionCode:'id',
                                 "text": "客户ID",
                                 "flex": 0,
                                 "dataIndex": "id",
@@ -38,7 +48,6 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                                 "xtype": "",
                                 "items": null
                             },{
-                                conditionCode:'cu_code',
                                 "text": "客户编号",
                                 "flex": 1,
                                 "dataIndex": "cu_code",
@@ -46,14 +55,12 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_name',
                                 "text": "客户名称",
                                 "flex": 1,
                                 "dataIndex": "cu_name",
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_type',
                                 "text": "客户类型",
                                 "flex": 1,
                                 "dataIndex": "cu_type",
@@ -95,10 +102,10 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
 
                 }
             },
+            // 物料编号
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
                         dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',

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

@@ -149,7 +149,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
             width: 120,
-            flex: 1
         }],
         relativeColumn: [{
             text: 'id',
@@ -211,7 +210,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
             width: 120,
-            flex: 1
         }]
     }
 });

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

@@ -1,5 +1,8 @@
 Ext.define('saas.view.stock.appropriationInOut.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.stock-appropriationinout-querypanel'
+    alias: 'viewmodel.stock-appropriationinout-querypanel',
+    data: {
+        closeEnable:false
+    }
 
 });

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

@@ -287,8 +287,8 @@ Ext.define('saas.view.stock.make.FormPanel', {
     },{
         xtype : "datefield", 
         name : "createTime", 
-        fieldLabel : "录入日期", 
-        allowBlank : true, 
+        fieldLabel : "录入日期",
+        readOnly:true,
         columnWidth : 0.25
     },{
         xtype : "textfield", 

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

@@ -43,7 +43,7 @@ Ext.define('saas.view.stock.make.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
+            hidden:true,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
@@ -70,23 +70,19 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             dataIndex: 'ma_qty',
             xtype: 'numbercolumn',
             width: 120,
-            flex: 1
         },{
             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: []
     }

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

@@ -1,5 +1,8 @@
 Ext.define('saas.view.stock.make.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.stock-make-querypanel'
+    alias: 'viewmodel.stock-make-querypanel',
+    data: {
+        closeEnable:false
+    }
 
 });

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

@@ -181,6 +181,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             from:'pr_whcode',to:'pd_whcode'
                         },{
                             from:'pr_whname',to:'pd_whname'
+                        },,{
+                            from:'pr_purcprice',to:'pd_orderprice'
                         }],
                         dbtpls: [{
                             field: 'pr_code',

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

@@ -112,44 +112,41 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
+            hidden:true,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
             dataIndex: 'pi_inoutno',
             width: 200
-        }, {
-            text: '单据状态',
-            dataIndex: 'pi_status',
-            width: 120
-        }, {
+        },{
             text: '单据类型',
             dataIndex: 'pi_class',
             width: 120
-        }, {
-            text: '下单日期',
+        },{
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200
         },{
-            text: '采购单号',
-            dataIndex: 'pi_pucode',
-            width: 200
+            text: '状态',
+            dataIndex: 'pi_status',
+            width: 120
         },{
-            text: '供应商名称',
-            dataIndex: 'pi_vendname',
+            text: '客户名称',
+            dataIndex: 'pi_custname',
             width: 120
         },{
-            text: '含税金额',
-            dataIndex: 'pi_total',
-            xtype:'numbercolumn',
+            text: '制单人',
+            dataIndex: 'pi_recordman',
             width: 120
         },{
-            text: '未税金额',
-            dataIndex: 'pi_nettotal',
-            xtype:'numbercolumn',
-            width: 120,
-            flex: 1
+            text: '审核人',
+            dataIndex: 'pi_auditman',
+            width: 120
+        },{
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 200
         }],
         relativeColumn: [{
             text: 'id',
@@ -211,7 +208,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
             width: 120,
-            flex: 1
         }]
     }
 });

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

@@ -1,5 +1,8 @@
 Ext.define('saas.view.stock.otherIn.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.stock-otherin-querypanel'
+    alias: 'viewmodel.stock-otherin-querypanel',
+    data: {
+        closeEnable:false
+    }
 
 });

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

@@ -172,6 +172,8 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             from:'pr_whcode',to:'pd_whcode'
                         },{
                             from:'pr_whname',to:'pd_whname'
+                        },,{
+                            from:'pr_purcprice',to:'pd_orderprice'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100

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

@@ -112,44 +112,41 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
+            hidden:true,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
             dataIndex: 'pi_inoutno',
             width: 200
-        }, {
-            text: '单据状态',
-            dataIndex: 'pi_status',
-            width: 120
-        }, {
+        },{
             text: '单据类型',
             dataIndex: 'pi_class',
             width: 120
-        }, {
-            text: '下单日期',
+        },{
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200
         },{
-            text: '采购单号',
-            dataIndex: 'pi_pucode',
-            width: 200
+            text: '状态',
+            dataIndex: 'pi_status',
+            width: 120
         },{
-            text: '供应商名称',
-            dataIndex: 'pi_vendname',
+            text: '客户名称',
+            dataIndex: 'pi_custname',
             width: 120
         },{
-            text: '含税金额',
-            dataIndex: 'pi_total',
-            xtype:'numbercolumn',
+            text: '制单人',
+            dataIndex: 'pi_recordman',
             width: 120
         },{
-            text: '未税金额',
-            dataIndex: 'pi_nettotal',
-            xtype:'numbercolumn',
-            width: 120,
-            flex: 1
+            text: '审核人',
+            dataIndex: 'pi_auditman',
+            width: 120
+        },{
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 200
         }],
         relativeColumn: [{
             text: 'id',
@@ -211,7 +208,6 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
             width: 120,
-            flex: 1
         }]
     }
 });

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

@@ -1,5 +1,8 @@
 Ext.define('saas.view.stock.otherOut.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.stock-otherout-querypanel'
+    alias: 'viewmodel.stock-otherout-querypanel',
+    data: {
+        closeEnable:false
+    }
 
 });

frontend/saas-web/packages/font-saas/Readme.md

@@ -0,0 +1 @@
+# font-saas

frontend/saas-web/packages/font-saas/build.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="font-ios" default=".help">
+    <!--
+    The build-impl.xml file imported here contains the guts of the build process. It is
+    a great idea to read that file to understand how the process works, but it is best to
+    limit your changes to this file.
+    -->
+    <import file="${basedir}/.sencha/package/build-impl.xml"/>
+
+    <!--
+    The following targets can be provided to inject logic before and/or after key steps
+    of the build process:
+
+        The "init-local" target is used to initialize properties that may be personalized
+        for the local machine.
+
+            <target name="-before-init-local"/>
+            <target name="-after-init-local"/>
+
+        The "clean" target is used to clean build output from the build.dir.
+
+            <target name="-before-clean"/>
+            <target name="-after-clean"/>
+
+        The general "init" target is used to initialize all other properties, including
+        those provided by Sencha Cmd.
+
+            <target name="-before-init"/>
+            <target name="-after-init"/>
+        
+        The "build" target performs the call to Sencha Cmd to build the application.
+
+            <target name="-before-build"/>
+            <target name="-after-build"/>
+    -->
+
+</project>

frontend/saas-web/packages/font-saas/index.js

@@ -0,0 +1,2 @@
+// This file was intentionally left blank.
+// This file is used by require.resolve to property locate this module.

frontend/saas-web/packages/font-saas/package.json

@@ -0,0 +1,32 @@
+{
+    "name": "@extjs/ext-font-saas",
+    "ext-react-name": "@extjs/ext-react-font-saas",
+    "ext-name": "@extjs/ext-font-saas",
+    "SenchaExtName": "@sencha/ext-font-saas",
+    "SenchaExtReactName": "@sencha/ext-react-font-saas",
+    "version": "6.6.0.258",
+    "sencha": {
+        "name": "font-saas",
+        "namespace": "Ext",
+        "type": "code",
+        "creator": "Sencha",
+        "summary": "saas iconfont",
+        "detailedDescription": "Saas iconfont from http://www.iconfont.cn/",
+        "version": "6.6.0.258",
+        "compatVersion": "6.2.0",
+        "format": "1",
+        "output": "${framework.dir}/build/packages/${package.name}",
+        "local": true,
+        "sass" : {
+            "namespace": "Ext",
+            "etc": "${package.dir}/sass/etc/all.scss",
+            "var": "${package.dir}/sass/var",
+            "src": [
+                "${package.dir}/sass/src",
+                "${package.dir}/sass/src/all.scss"
+            ]
+        },
+        "classpath": "${package.dir}/src",
+        "overrides": "${package.dir}/overrides"
+    }
+}

frontend/saas-web/packages/font-saas/sass/etc/icons.scss

@@ -0,0 +1,14 @@
+
+.sa-purchase:before { content: "\e613"; }
+
+.sa-document:before { content: "\e654"; }
+
+.sa-edit:before { content: "\e6ec"; }
+
+.sa-sale:before { content: "\e638"; }
+
+.sa-warehouse:before { content: "\e63c"; }
+
+.sa-setting:before { content: "\e64b"; }
+
+.sa-money:before { content: "\e6fa"; }

frontend/saas-web/resources/json/navigation.json

@@ -256,7 +256,7 @@
     }]
 },{
     "text": "设置",
-    "iconCls": "x-fa fa-cog",
+    "iconCls": "x-sa sa-setting",
     "items": [{
         "text": "系统设置",
         "items": [{