1

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

@@ -11,6 +11,12 @@ function initialize(){
     if($("#productId").val()!=null&&$("#productId").val()!=""){
         showTable({proofingApplyId:$("#proofingApplyId").val()});
     }
+    let isDetailPage = ($("#isDetailPage").val() === "true");
+
+    if (isDetailPage) {
+        showTable({proofingMakeId:$("#proofingMakeId").val()});
+        $("#jobPageTop").hide();
+    }
 }
 //绑定selectC
 function bindQueryEvent() {

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

@@ -154,7 +154,6 @@ function loadProofingApplyListGrid() {
 }
 
 function query(obj) {
-    debugger
     var param = $(obj).formToJSON();
     UICtrl.gridSearch(gridManager, param);
 }
@@ -191,6 +190,6 @@ function doView(id) {
     UICtrl.addTabItem({
         tabid: 'proofingApply'+id,
         text: "打样单详情",
-        url: web_app.name + '/proofingApply/showProofingApply.job?bizId='+id
+        url: web_app.name + '/proofingApply/showProofingApply.job?bizId='+id+"&isDetailPage=true"
     });
 }
\ No newline at end of file

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

@@ -42,13 +42,12 @@ function saveForm() {
    let extendedData= getTableResult();
 
    if(!extendedData) return false;
-    debugger
+
     var _self = this;
     $('#submitForm').ajaxSubmit({
         url: web_app.name + '/proofingMake/saveProofingMake.ajax',
         param: extendedData,
         success: function (data) {
-            debugger
             $("#proofingMakeId").val(data.proofingMakeId)
             $("#proofingMakeLookedId").val(data.proofingMakeLookedId)
             $("#proofingMakePdPublishedConfId").val(data.proofingMakePdPublishedConfId)

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

@@ -196,30 +196,12 @@ function updateHandler() {
 
       let  row = DataUtil.getUpdateRow(gridManager);
 
-    // UICtrl.showAjaxDialog({
-    //     url: web_app.name + '/proofingMake/forwardDetailsProofingMake.load',
-    //     title: "修改打样制造单",
-    //     width: 1500,
-    //     param: {id: row.proofingMakeId},
-    //     ok:function (div) {
-            // save()
             UICtrl.addTabItem({
                 tabid: 'updateProofingMake'+row.proofingMakeId,
                 text: "制造单修改",
                 url: web_app.name + '/proofingMake/forwardDetailsProofingMake.do?id='+row.proofingMakeId
             });
-        // }
-        // ok: function (div) {
-        //     var _self = this;
-        //     $('#submitForm', div).ajaxSubmit({
-        //         url: web_app.name + '/proofingMake/saveProofingMake.ajax',
-        //         success: function () {
-        //             _self.close();
-        //             reloadGrid();
-        //         }
-        //     });
-    //     }
-    // });
+
 }
 
 //重写DataUtil的getUpdateRowId函数、它默认取行的id列

topsun-xt/src/main/webapp/biz/topsun/proofing/workInstruction.jsp

@@ -38,7 +38,7 @@
 
                 <x:inputC name="productType"  label="产品类别"  labelCol="1"
                           fieldCol="2"/>
-                <x:inputC name="productUnit"  label="单位" maxLength="32" labelCol="1"
+                <x:inputC name="productUnit"  label="采购单位" maxLength="32" labelCol="1"
                           fieldCol="2"/>
                 <x:inputC name="sizeGroupId"  label="尺码组" maxLength="32" labelCol="1"
                           fieldCol="2"/>

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

@@ -65,23 +65,6 @@ function resetForm(obj) {
     $(obj).formClean();
 }
 
-// function addHandler() {
-//     UICtrl.showAjaxDialog({
-//         url: web_app.name + '/proofingMake/forwardSaveProofingMake.load',
-//         title: "新增打样制造单",
-//         width: 1000,
-//         ok: function (div) {
-//             var _self = this;
-//             $('#submitForm', div).ajaxSubmit({
-//                 url: web_app.name + '/proofingMake/saveProofingMake.ajax',
-//                 success: function () {
-//                     _self.close();
-//                     reloadGrid();
-//                 }
-//             });
-//         }
-//     });
-// }
 
 function updateHandler() {
 
@@ -92,22 +75,6 @@ function updateHandler() {
         text: "修改作业指导书",
         url: web_app.name + '/workInstruction/forwardDetailsWorkInstruction.do?id='+row.workInstructionBaseInfoId
     });
-    // UICtrl.showAjaxDialog({
-    //     url: web_app.name + '/workInstruction/forwardDetailsWorkInstruction.load',
-    //     title: "修改作业指导单",
-    //     width: 1500,
-    //     param: {id: row.workInstructionBaseInfoId},
-    //     ok: function (div) {
-    //         var _self = this;
-    //         $('#submitForm', div).ajaxSubmit({
-    //             url: web_app.name + '/workInstruction/saveWorkInstruction.ajax',
-    //             success: function () {
-    //                 _self.close();
-    //                 reloadGrid();
-    //             }
-    //         });
-    //     }
-    // });
 }
 
 
@@ -123,7 +90,6 @@ function deleteHandler() {
 }
 
 function doView(workInstructionId) {
-    debugger
     UICtrl.addTabItem({
         tabid: 'workInstruction'+workInstructionId,
         text: "作业指导书详情",

topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyApplicationImpl.java

@@ -194,4 +194,5 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
     public ProofingApplyBaseInfo selectProofingApplyByProofingApplyNo(String proofingApplyNo) {
         return proofingApplyRepository.findByProofingApplyNo(proofingApplyNo);
     }
-}
+
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingApplyController.java

@@ -84,6 +84,8 @@ public class ProofingApplyController extends CommonController {
     public String showProofingApply() {
         SDO sdo = this.getSDO();
         String id = sdo.getBizId();
+        String isDetailPage = sdo.getString("isDetailPage");
+        if("true".equals(isDetailPage)) this.putAttribute("isDetailPage","true");
         ProofingApplyBaseInfo proofingApply = proofingApplyApplication.loadProofingApplyById(id);
         ProofingApplyLooked proofingApplyLooked = proofingApplyLookedApplication.findByProofingApplyId(proofingApply.getProofingApplyId());
         ProofingApplyBaseInfoVo vo =new ProofingApplyBaseInfoVo();

topsun/src/main/resources/config/content/easysearch/easy-search-product.xml

@@ -29,13 +29,13 @@
     <easy-search name="productDetail" desc="产品详情">
         <sql>
             SELECT
-            pi.*,p.product_name,p.product_status,p.product_unit,p.brand_name,
+            pi.*,p.product_name,p.product_status,p.product_unit as product_buy_unit,p.brand_name,
             p.is_build_bom, p.confirm_date,
             p.comfirm_person, p.is_free_inspection, p.is_no_quality_loss, p.sample_order_no,
             p.stock_no, p.stock_name, p.file_no,
             pd.product_english_name,
             wa.work_instruction_apply_id, wa.specification_no, wa.matrixing_value, wa.size_group_id,
-            wa.is_disable, wa.is_new_specification, wa.is_shoe_pattern,
+            wa.is_disable, wa.is_new_specification, wa.is_shoe_pattern,wa.product_unit,
             wa.is_attached_sample, wa.is_only_code, wa.is_body_color,wa.brand,wa.store_name,
             pl.proofing_make_looked_id, pl.is_output, pl.is_out, pl.is_change,
             pl.plastic_bag_structure, pl.product_length, pl.product_width, pl.product_height,
@@ -78,6 +78,9 @@
         <field name="仓库" title="仓库" code="storeName" width="200" type='hidden'/>
         <field name="尺码组" title="尺码组" code="sizeGroupId" width="200" type='hidden'/>
         <field name="采购换算值" title="采购换算值" code="matrixingValue" width="200" type='hidden'/>
+        <field name="采购单位" title="采购单位" code="productUnit" width="200" type='hidden'/>
+
+        <field name="单位" title="单位" code="productBuyUnit" width="200" type='hidden'/>
 
         <field name="制造单号" title="制造单号" code="proofingMakeNo" width="200"/>
         <field name="指导申请书单号" title="指导申请书单号" code="workInstructionApplyId" width="200"/>
@@ -95,7 +98,7 @@
         <field name="是否写码" title="是否写码(is_open)" code="productCoding" width="200" type='hidden'/>
         <field name="体系认证" title="体系认证" code="productSysCertification" width="200" type='hidden'/>
 
-        <field name="采购单位" title="采购单位" code="productBuyUnit" width="200" type='hidden'/>
+
 
         <field name="排版参数配置id" title="排版参数配置id" code="productPublishedConfId" width="200" type='hidden'/>
         <field name="模数" title="模数" code="modulus" width="200" type='hidden'/>