指导回显

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

@@ -99,7 +99,6 @@ function ajaxRenderDataGoForm(proofingApplyNo) {
  * @param obj
  */
 function renderingDictionaries(obj) {
-
     console.log(obj)
     //获取所有select的id名与对象匹配
     $("select").each(function () {

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

@@ -16,7 +16,7 @@
             <div style="flex: 1;">
                 <h3>基本信息</h3>
             </div>
-            <div style="text-align: right;padding-right: 50px;">
+            <div style="text-align: right;padding-right: 50px; " id="formButton">
                 <x:button value="保存" onclick="saveForm()" icon="fa-save"/>
                 <x:button value="重置" onclick="resetForm(this.form)" icon="fa-history"/>
             </div>

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

-$(document).ready(function () {
+ $(document).ready(function () {
     bindQueryEvent();
 });
 
@@ -8,6 +8,7 @@ function bindQueryEvent() {
         type: "product", name: "productDetail",
         onChange: function (value, data) {
             $('#submitForm').formSet(data);
+            renderingDictionaries(data);
         }
     });
 }
@@ -32,3 +33,35 @@ function resetForm(obj) {
     $(obj).formClean();
 }
 
+
+ /**
+  * 渲染带数据字典的select
+  * @param obj
+  */
+ function renderingDictionaries(obj) {
+     console.log(obj)
+     //获取所有select的id名与对象匹配
+     $("select").each(function () {
+         var id = $(this).attr("id");
+         if (obj.hasOwnProperty(id)) {
+
+             var keyValuePairs = new Map();
+
+             $('#' + id + ' option').each(function () {
+                 var value = $(this).val();
+                 var text = $(this).text();
+                 keyValuePairs.set(value, text);
+             });
+
+             // 获取 对应的文本值
+             var selectedValue = obj[id];
+             var selectedText = keyValuePairs.get(selectedValue);
+
+             // 将文本值赋值给目标元素
+             $('#' + id + '_text').val(selectedText);
+             $('#' + id).val(selectedValue);
+
+             console.log("select:" + id+"("+selectedText+":"+selectedValue+")")
+         }
+     });
+ }
\ No newline at end of file

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

@@ -28,19 +28,63 @@
 
     <easy-search name="productDetail" desc="产品详情">
         <sql>
+<!--            SELECT-->
+<!--            p.product_code,p.product_name, pc.product_category_name,pl.*,-->
+<!--            ppc.modulus,ppc.row_num,ppc.column_num,ppc.contact_num,ppc.row_double_blade,ppc.column_double_blade,ppc.dispatch_multiple,ppc.sheet_length,ppc.sheet_width,ppc.product_sheet_conf,-->
+<!--            pl2.product_loss_max,pl2.product_loss_rate,pl2.product_loss_redundance,pl2.product_loss_remark,pl2.customer_name-->
+<!--            FROM product p-->
+<!--            LEFT JOIN product_category pc ON pc.product_category_id = p.product_category_id-->
+<!--            LEFT JOIN product_detail pd ON pd.product_id = p.product_id-->
+<!--            LEFT JOIN product_looked pl ON pl.product_id = p.product_id-->
+<!--            LEFT JOIN product_published_conf ppc ON ppc.product_id = p.product_id-->
+<!--            LEFT JOIN product_loss pl2 ON pl2.product_id = p.product_id-->
             SELECT
-            p.product_name, pc.product_category_name,pl.*,
-            ppc.modulus,ppc.row_num,ppc.column_num,ppc.contact_num,ppc.row_double_blade,ppc.column_double_blade,ppc.dispatch_multiple,ppc.sheet_length,ppc.sheet_width,ppc.product_sheet_conf,
-            pl2.product_loss_max,pl2.product_loss_rate,pl2.product_loss_redundance,pl2.product_loss_remark,pl2.customer_name
-            FROM product p
-            LEFT JOIN product_category pc ON pc.product_category_id = p.product_category_id
-            LEFT JOIN product_detail pd ON pd.product_id = p.product_id
-            LEFT JOIN product_looked pl ON pl.product_id = p.product_id
-            LEFT JOIN product_published_conf ppc ON ppc.product_id = p.product_id
-            LEFT JOIN product_loss pl2 ON pl2.product_id = p.product_id
+            pi.*,p.product_name,p.product_status,p.product_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,
+            wa.is_disable, wa.is_new_specification, wa.is_shoe_pattern,
+            wa.is_attached_sample, wa.is_only_code, wa.is_body_color,
+            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,
+            pl.product_thick, pl.product_single_layer, pl.product_layer_num, pl.sample_shape,
+            pl.sample_shape_size, pl.planned_flow_id, pl.file_storage_location, pl.sample_material,
+            pl.product_weight, pl.product_aperture, pl.product_single_weight, pl.proofing_make_status,
+            pl.is_confirm,
+            pc.proofing_make_pd_published_conf_id, pc.modulus, pc.row_num,
+            pc.column_num, pc.contact_num, pc.row_double_blade, pc.column_double_blade,
+            pc.dispatch_multiple, pc.sheet_length, pc.sheet_width, pc.print_front_coler,
+            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
         </sql>
         <field name="产品id" title="产品id" code="productId" width="200" />
+        <field name="产品编号" title="产品编号" code="productCode" width="200" />
         <field name="产品name" title="产品name" code="productName" width="200"/>
+        <field name="唯一码产品" title="唯一码产品" code="isOnlyCode" width="200" type='hidden'/>
+        <field name="不考虑形体配色" title="不考虑形体配色" code="isBodyColor" width="200" type='hidden'/>
+        <field name="唯一码产品" title="唯一码产品" code="isOnlyCode" width="200" type='hidden'/>
+        <field name="是否禁用" title="是否禁用" code="isDisable" width="200" type='hidden'/>
+        <field name="是否建立BON表" title="是否建立BON表" code="isBuildBom" width="200" type='hidden'/>
+        <field name="确认日期" title="确认日期" code="confirmDate" width="200" type='hidden'/>
+        <field name="确认人" title="确认人" code="comfirmPerson" width="200" type='hidden'/>
+        <field name="是否免检" title="是否免检" code="isFreeInspection" width="200" type='hidden'/>
+        <field name="不要质量loss" title="不要质量loss" code="isNoQualityLoss" width="200" type='hidden'/>
+        <field name="样品单号" title="样品单号" code="sampleOrderNo" width="200" type='hidden'/>
+        <field name="库存编码" title="库存编码" code="stockNo" width="200" type='hidden'/>
+        <field name="库存名称" title="库存名称" code="stockName" width="200" type='hidden'/>
+        <field name="存档编号" title="存档编号" code="fileNo" width="200" type='hidden'/>
+        <field name="品牌" title="品牌" code="barnd" width="200" type='hidden'/>
+
+
+        <field name="制造单号" title="制造单号" code="proofingMakeNo" width="200"/>
+        <field name="指导申请书单号" title="指导申请书单号" code="workInstructionBaseInfoId" width="200"/>
         <field name="长;单位cm" title="长;单位cm" code="productLength" width="200" type='hidden'/>
         <field name="宽;单位cm" title="宽;单位cm" code="productWidth" width="200" type='hidden'/>
         <field name="高;单位cm" title="高;单位cm" code="productHeight" width="200" type='hidden'/>