申请改

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

@@ -12,16 +12,11 @@ function initialize() {
      */
     let isDetailPage = ($("#isDetailPage").val() === "true");
     if (isDetailPage) {
-        let proofingApplyNo = $("#proofingApplyNo").val();
-        if (proofingApplyNo != null && proofingApplyNo !== '') {
-            // ajaxRenderDataGoForm(proofingApplyNo);
-            debugger
         showTable({proofingMakeId:$("#proofingMakeId").val()});
-        }
-        // if($("#proofingMakeNo").prop("readonly")){
-        //     $("#formButton").hide();
-        // }
        $("#jobPageTop").hide();
+        if($("#jobPageTop").length>0){
+            $("#formButton").hide();
+        }
     }
 }
 
@@ -42,7 +37,7 @@ function bindQueryEvent() {
  * @returns {boolean}
  */
 function saveForm() {
-    debugger
+
    let extendedData= getTableResult();
 
    if(!extendedData) return false;

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

@@ -13,10 +13,10 @@
      debugger
      let isDetailPage = ($("#isDetailPage").val() === "true");
      if (isDetailPage) {
-         // if($("#productCode").prop("readonly")){
-         //     $("#formButton").hide();
-         // }
          $("#jobPageTop").hide();
+         if($("#jobPageTop").length>0){
+             $("#formButton").hide();
+         }
      }
  }
 

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

@@ -12,10 +12,10 @@ function initialize() {
      */
     let isDetailPage = ($("#isDetailPage").val() === "true");
     if (isDetailPage) {
-        // if($("#productCode").prop("readonly")){
-        //     $("#formButton").hide();
-        // }
         $("#jobPageTop").hide();
+        if($("#jobPageTop").length>0){
+            $("#formButton").hide();
+        }
     }
 }
 

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

@@ -83,7 +83,7 @@ function updateHandler(row) {
     }
     UICtrl.addTabItem({
         tabid: 'updateWorkInstructionApply'+row.workInstructionApplyId,
-        text: "作业申请书详情",
+        text: "修改作业申请书",
         url: web_app.name + '/workInstructionApply/forwardDetailsWorkInstructionApply.do?id='+row.workInstructionApplyId
     });
 }

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

@@ -59,10 +59,10 @@
             pc.print_opposite_color
             FROM proofing_make_base_info pi
             inner JOIN work_instruction_apply wa ON wa.proofing_make_id = pi.proofing_make_id
-            LEFT JOIN proofing_make_looked pl ON pl.proofing_make_id = pi.proofing_make_id
-            LEFT JOIN proofing_make_pd_published_conf pc ON pc.proofing_make_id = pi.proofing_make_id
-            left join product p on pi.product_code=p.product_code
-            left join product_detail pd on pd.product_id=p.product_id
+            inner JOIN proofing_make_looked pl ON pl.proofing_make_id = pi.proofing_make_id
+            inner JOIN proofing_make_pd_published_conf pc ON pc.proofing_make_id = pi.proofing_make_id
+            inner join product p on pi.product_code=p.product_code
+            inner join product_detail pd on pd.product_id=p.product_id
         </sql>
         <field name="产品id" title="产品id" code="productId" width="200" />
         <field name="产品编号" title="产品编号" code="productCode" width="200" />