bug调整

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApplyList.js

@@ -147,7 +147,7 @@ function loadProofingApplyListGrid() {
         fixedCellHeight: true,
         selectRowButtonOnly: true,
         onDblClickRow: function (data, rowindex, rowobj) {
-            // doView(data.id);
+             doView(data.id);
         }
     });
     UICtrl.setSearchAreaToggle(gridManager);
@@ -233,8 +233,8 @@ function deleteHandler() {
 
 function doView(proofingApplyId) {
     UICtrl.addTabItem({
-        tabid: 'proofingApply',
+        tabid: 'proofingApply'+proofingApplyId,
         text: "详情",
-        url: web_app.name + '/proofingApply/skipProofingApply.do?id='+proofingApplyId
+        url: web_app.name + '/proofingApply/showProofingApply.job?bizId='+proofingApplyId
     });
 }
\ No newline at end of file

topsun-xt/src/main/webapp/biz/topsun/quotation/quotationDetail.js

@@ -128,16 +128,20 @@ function reloadGrid() {
 function reloadTechnologyGrid(){
     var datas = bomGridManager.rows;
     var productIdList=[];
-    if (datas){
+    if (datas.length >0){
         datas.forEach(data=>{
             var productId = data.productId;
-            productIdList.push(productId);
+            if (productId != null && productId !== ""){
+                productIdList.push(productId);
+            }
         })
+        if (productIdList.length > 0){
+            var param = {ids:$.toJSON(productIdList)};
+            $('#technologyGrid').ligerGetGridManager().options.url =web_app.name + '/technology/queryTechnologyByProduct.ajax';
+            _grid = UICtrl.getGridManager('#technologyGrid');
+            UICtrl.gridSearch(_grid, param);
+        }
     }
-    var param = {ids:$.toJSON(productIdList)};
-    $('#technologyGrid').ligerGetGridManager().options.url =web_app.name + '/technology/queryTechnologyByProduct.ajax';
-    _grid = UICtrl.getGridManager('#technologyGrid');
-    UICtrl.gridSearch(_grid, param);
 }
 
 //获取数据保存的参数
@@ -171,6 +175,8 @@ function getId() {
 
 function setId(value) {
     $("#quotationId").val(value);
+    var _grid=UICtrl.getGridManager('#bomGrid');
+    _grid.options.parms.quotationId = value;
 }
 
 

topsun-xt/src/main/webapp/biz/topsun/quotation/quotationList.js

@@ -31,7 +31,7 @@ function loadQuotationListGrid() {
                 align: "left"
             },
             {
-                display: "品牌/工厂客户",
+                display: "客户名称",
                 name: "customerManagerId",
                 width: 120,
                 minWidth: 60,

topsun/src/main/java/com/huigou/topsun/quotation/domain/model/Quotation.java

@@ -30,7 +30,7 @@ public class Quotation extends FlowBillAbstractEntity {
      * 品牌/工厂客户id
      */
     @Column(name = "customer_manager_id")
-    private Long customerManagerId;
+    private String customerManagerId;
 
     /**
      * 报价日期
@@ -42,7 +42,7 @@ public class Quotation extends FlowBillAbstractEntity {
      * 修改人id
      */
     @Column(name = "update_by")
-    private Long updateBy;
+    private String updateBy;
 
     /**
      * 修改时间
@@ -101,17 +101,17 @@ public class Quotation extends FlowBillAbstractEntity {
     /**
      * 主管
      */
-    private Long manager;
+    private String manager;
 
     /**
      * 经办人
      */
-    private Long handler;
+    private String handler;
 
     /**
      * 业务员
      */
-    private Long salesman;
+    private String salesman;
 
     private static final long serialVersionUID = 1L;