Skip to content

T
topsun-bpm
Commit 2ca4e0fb authored by 覃振观's avatar 覃振观 👶
Browse files
Options

888 js BUG

parent 9fa1499a
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 89 deletions
topsun-xt/src/main/webapp/biz/topsun/product/productDetail.js
View file @ 2ca4e0fb
...@@ -3,7 +3,7 @@ $(document).ready(function() { ...@@ -3,7 +3,7 @@ $(document).ready(function() {
initializeUI(); initializeUI();
initializeToobarContainer(); initializeToobarContainer();
initializeTab(); initializeTab();
// initializateSelectC(); initializateSelectC();
// runObserver(); // runObserver();
}); });
...@@ -19,10 +19,11 @@ function initializeTab() { ...@@ -19,10 +19,11 @@ function initializeTab() {
} }
function initializateSelectC() { function initializateSelectC() {
$('#productId').searchbox({ $('#selectedCategory').searchbox({
type: "product", type: "product",
name: "productCode", name: "productCode2",
onChange: function (value, data) { onChange: function (value, data) {
$('#selectedCategory').val(data.productCategoryName)
} }
}); });
} }
...@@ -35,8 +36,6 @@ function initializeUI() { ...@@ -35,8 +36,6 @@ function initializeUI() {
allowRightCollapse: false, allowRightCollapse: false,
allowRightResize: false allowRightResize: false
}); });
var gm=UICtrl.getGridManager("#layout");
UICtrl.onGridResize(gm);
} }
function deleteHandler(){ function deleteHandler(){
...@@ -105,12 +104,14 @@ function loadDataTest() { ...@@ -105,12 +104,14 @@ function loadDataTest() {
// Grid: 需要监听 Grid Data 时，必须设置 唯一 id 列。 // Grid: 需要监听 Grid Data 时，必须设置 唯一 id 列。
var dataMapping = { var dataMapping = {
Product: [ Product: [
"productId", "brandName","productCategoryId", "productUnit", "productSizeGroupId", "confirmDate", "comfirmPerson" "productId", "brandName","productCategoryId", "productUnit", "productSizeGroupId"
, "isOnlyCode", "isBodyColor", "isDisable", "isBuildBom"
, "confirmDate", "comfirmPerson"
, "isFreeInspection", "isNoQualityLoss", "sampleOrderNo", "stockNo", "fileNo", "brandName" , "isFreeInspection", "isNoQualityLoss", "sampleOrderNo", "stockNo", "fileNo", "brandName"
], ],
ProductDetail: [ ProductDetail: [
{"factoryName": "factoryName"}, "productLayout", "materialCode", "productCode", "productEnCode", "bodyColor" {"factoryName": "factoryName"}, "productLayout", "materialCode", "productCode", "productEnCode", "bodyColor"
, "customerMaterialCode" ,"versionNo", "isNewSpecification", "specificationNo" , "customerMaterialCode" ,"versionNo", "isNewSpecification", "specificationNo", "productSubstrate"
], ],
ProductLooked: [ ProductLooked: [
"productLength", "productWidth", "productHeight", "productThick", "productWeight", "productAngleType", "productAngle" "productLength", "productWidth", "productHeight", "productThick", "productWeight", "productAngleType", "productAngle"
......
topsun-xt/src/main/webapp/biz/topsun/product/productDetail.jsp
View file @ 2ca4e0fb
...@@ -55,23 +55,53 @@ ...@@ -55,23 +55,53 @@
<%-- </div>--%> <%-- </div>--%>
<form class="hg-form" method="post" action="" id="submitForm"> <form class="hg-form" method="post" action="" id="submitForm">
<div class="hg-form-row"> <div class="hg-form-row">
<x:title title="基本属性" name="group" hideTable="#info" />
<x:inputC name="productId" required="true" label="产品编码" labelCol="1" fieldCol="3" maxLength="64" /> <div class="hg-form-row">
<x:inputC name="productName" required="true" label="产品名称" labelCol="1" fieldCol="7" maxLength="64" /> <x:title title="基本属性" name="group" hideTable="#info" />
<x:selectC name="productCategoryId" required="true" label="产品类别ID" id="selectedCategory" labelCol="1" fieldCol="3"/> <x:inputC name="productId" required="true" label="产品编码" labelCol="1" fieldCol="2" maxLength="64" />
<%-- <x:inputC name="productCategoryId" required="true" label="产品类别ID" wrapper="select" labelCol="2" maxLength="64"--%> <x:inputC name="productName" required="true" label="产品名称" labelCol="1" fieldCol="7" maxLength="64" />
<%-- fieldCol="4" />--%> </div>
<x:inputC name="productUnit" required="true" label="单位" labelCol="1" fieldCol="3" maxLength="32" />
<x:inputC name="productSizeGroupId" label="尺码组" labelCol="1" fieldCol="3" maxLength="32" /> <div class="hg-form-row">
<x:inputC name="confirmDate" label="确认日期" labelCol="1" fieldCol="3" maxLength="32" /> <x:inputC name="productCategoryId" wrapper="select" label="产品类别" id="selectedCategory" labelCol="1" fieldCol="2"/>
<x:inputC name="comfirmPerson" label="确认人" labelCol="1" fieldCol="3" maxLength="32" /> <x:inputC name="productUnit" required="true" label="单位" labelCol="1" fieldCol="1" maxLength="32" />
<x:inputC name="isFreeInspection" label="是否吗免检" labelCol="1" fieldCol="1" maxLength="32" /> <x:inputC name="productSizeGroupId" label="尺码组" labelCol="1" fieldCol="1" maxLength="32" />
<x:inputC name="isNoQualityLoss" label="不要字量loss%" labelCol="1" fieldCol="1" maxLength="32" /> <div class="col-xs-4 col-sm-1 " style="padding-top:5px">
<x:inputC name="sampleOrderNo" label="样品单号" labelCol="1" fieldCol="3" maxLength="32" /> <x:checkbox name="isOnlyCode" label="是否为唯一码产品"/>
<x:inputC name="stockNo" label="库存编码" labelCol="1" fieldCol="3" maxLength="32" /> </div>
<x:inputC name="stockName" label="库存名称" labelCol="1" fieldCol="3" maxLength="32" /> <div class="col-xs-4 col-sm-1 " style="padding-top:5px">
<x:inputC name="fileNo" label="存档编号" labelCol="1" fieldCol="3" maxLength="32" /> <x:checkbox name="isDisable" label="是否禁用"/>
<x:inputC name="brandName" label="品牌名称" labelCol="1" maxLength="32" fieldCol="4" /> </div>
<div class="col-xs-4 col-sm-1 " style="padding-top:5px">
<x:checkbox name="isBuildBom" label="是否建立bom表"/>
</div>
<div class="col-xs-4 col-sm-2 " style="padding-top:5px;">
<x:checkbox name="isBodyColor" label="是否不考虑形体配色"/>
</div>
</div>
<div class="hg-form-row">
<x:inputC name="confirmDate" label="确认日期" labelCol="1" fieldCol="2" maxLength="32" />
<x:inputC name="comfirmPerson" label="确认人" labelCol="1" fieldCol="2" maxLength="32" />
<div class="col-xs-12 col-sm-1 col-warp col-white-bg" style="padding-top:5px">
<x:checkbox name="isFreeInspection" label="是否吗免检"/>
</div>
<div class="col-xs-12 col-sm-1 col-warp col-white-bg" style="padding-top:5px">
<x:checkbox name="isNoQualityLoss" label="不要字量loss%"/>
</div>
</div>
<div class="hg-form-row">
<x:inputC name="sampleOrderNo" label="样品单号" labelCol="1" fieldCol="3" maxLength="32" />
<x:inputC name="stockNo" label="库存编码" labelCol="1" fieldCol="3" maxLength="32" />
<x:inputC name="stockName" label="库存名称" labelCol="1" fieldCol="3" maxLength="32" />
</div>
<div class="hg-form-row">
<x:inputC name="fileNo" label="存档编号" labelCol="1" fieldCol="3" maxLength="32" />
<x:inputC name="brandName" label="品牌名称" labelCol="1" fieldCol="3" maxLength="32" />
</div>
</div> </div>
<div id='pageTab' style="margin: 0px;"> <div id='pageTab' style="margin: 0px;">
...@@ -84,89 +114,120 @@ ...@@ -84,89 +114,120 @@
</div> </div>
<div class="ui-tab-content" style="padding: 2px; padding-right: 0;"> <div class="ui-tab-content" style="padding: 2px; padding-right: 0;">
<div class="layout" id='detailFormDiv'> <div class="layout" id='detailFormDiv'>
<x:inputC name="factoryName" label="制造工厂" labelCol="1" fieldCol="3" maxLength="64" /> <div class="hg-form-row">
<x:inputC name="factoryName" label="客户名称(无对应)" labelCol="1" fieldCol="3" maxLength="64" /> <x:inputC name="factoryName" label="制造工厂" labelCol="1" fieldCol="3" maxLength="64" />
<x:inputC name="factoryName" label="客户名称(无对应)" labelCol="1" fieldCol="3" maxLength="64" />
<x:inputC name="productLayout" label="版面" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="materialCode" label="材料代号" labelCol="1" fieldCol="1" maxLength="64" />
</div>
<%-- <x:inputC name="date" wrapper="date" required="true" label="日期" labelCol="2" maxLength="64"--%> <%-- <x:inputC name="date" wrapper="date" required="true" label="日期" labelCol="2" maxLength="64"--%>
<%-- fieldCol="4" />--%> <%-- fieldCol="4" />--%>
<x:inputC name="productLayout" label="版面" labelCol="1" fieldCol="1" maxLength="64" /> <div class="hg-form-row">
<x:inputC name="materialCode" label="材料代号" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productCode" label="产品代号" labelCol="1" fieldCol="3" maxLength="64" />
<x:inputC name="productCode" label="产品代号" labelCol="1" fieldCol="3" maxLength="64" /> <x:inputC name="productEnCode" label="英文名称" labelCol="1" fieldCol="5" maxLength="64" />
<x:inputC name="productEnCode" label="英文名称" labelCol="1" fieldCol="5" maxLength="64" /> <x:inputC name="bodyColor" label="型体配色" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="bodyColor" label="型体配色" labelCol="1" fieldCol="1" maxLength="64" /> </div>
<x:inputC name="customerMaterialCode" label="客户料号" labelCol="1" fieldCol="3" maxLength="64" /> <div class="hg-form-row">
<x:inputC name="versionNo" label="版本号" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="customerMaterialCode" label="客户料号" labelCol="1" fieldCol="3" maxLength="64" />
<x:inputC name="isNewSpecification" label="是否创建新规格书" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="versionNo" label="版本号" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="specificationNo" label="规格书编号" labelCol="1" fieldCol="3" maxLength="64" /> <x:inputC name="isNewSpecification" label="是否创建新规格书" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="specificationNo" label="规格书编号" labelCol="1" fieldCol="3" maxLength="64" />
</div>
<x:title title="外观描述" name="group" hideTable="#info" /> <x:title title="外观描述" name="group" hideTable="#info" />
<x:inputC name="productLength" label="长度" labelCol="1" fieldCol="1" maxLength="64"/> <div class="hg-form-row">
<x:inputC name="productWidth" label="宽度" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productLength" label="长度" labelCol="1" fieldCol="1" maxLength="64"/>
<x:inputC name="productHeight" label="高度" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productWidth" label="宽度" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="productThick" label="厚度" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productHeight" label="高度" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="productWeight" label="成品克重" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productThick" label="厚度" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="productAngleType" label="角型" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productWeight" label="成品克重" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="productAngle" label="角度" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productAngleType" label="角型" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="productAperture" label="孔径" labelCol="1" fieldCol="1" maxLength="64" /> </div>
<x:inputC name="productSingleLayer" label="单层厚" labelCol="1" fieldCol="1" maxLength="64" /> <div class="hg-form-row">
<x:inputC name="productSingleWeight" label="单重" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productAngle" label="角度" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="productLayerNum" label="层数" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productAperture" label="孔径" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="productMould" label="是否防霉" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productSingleLayer" label="单层厚" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="productCoding" label="是否写码" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productSingleWeight" label="单重" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="productSysCertification" label="体系认证" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productLayerNum" label="层数" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="storeName" label="仓库" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productMould" label="是否防霉" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="productBuyUnit" label="采购单位" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productCoding" label="是否写码" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="purchaseConversionValue" label="采购换算值" labelCol="1" fieldCol="1" maxLength="64" /> </div>
<x:inputC name="coefficient" label="系数" labelCol="1" fieldCol="1" maxLength="64" /> <div class="hg-form-row">
<x:inputC name="productSysCertification" label="体系认证" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="storeName" label="仓库" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="productBuyUnit" label="采购单位" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="purchaseConversionValue" label="采购换算值" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="coefficient" label="系数" labelCol="1" fieldCol="1" maxLength="64" />
</div>
<x:title title="排版参数" name="group" hideTable="#info" /> <x:title title="排版参数" name="group" hideTable="#info" />
<x:inputC name="modulus" label="模数" labelCol="1" fieldCol="1" maxLength="64" /> <div class="hg-form-row">
<x:inputC name="columnNum" label="列数" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="modulus" label="模数" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="rowNum" label="行数" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="columnNum" label="列数" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="contactNum" label="搭版数" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="rowNum" label="行数" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="columnDoubleBlade" label="列双刀位" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="contactNum" label="搭版数" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="rowDoubleBlade" label="行双刀位" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="columnDoubleBlade" label="列双刀位" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="dispatchMultiple" label="派工倍数" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="rowDoubleBlade" label="行双刀位" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="sheetLength" label="印张长度" labelCol="1" fieldCol="1" maxLength="64" /> </div>
<x:inputC name="sheetWidth" label="印张宽度" labelCol="1" fieldCol="1" maxLength="64" /> <div class="hg-form-row">
<x:inputC name="productSheetConf" label="产品印张设置" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="dispatchMultiple" label="派工倍数" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="sheetLength" label="印张长度" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="beerPlateNo" required="false" label="啤版编号" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="sheetWidth" label="印张宽度" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="goldPlateNo" required="false" label="烫金版编号" labelCol="1" fieldCol="1" maxLength="64" /> <x:inputC name="productSheetConf" label="产品印张设置" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="dieCutPlateNo" required="false" label="模切版编号" labelCol="1" fieldCol="1" maxLength="64" /> </div>
<x:inputC name="copperpResinLateNo" required="false" label="铜版及树脂版编号" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="netPlateNo" required="false" label="网版编号" labelCol="1" fieldCol="3" maxLength="64" />
<x:inputC name="productProperty" required="false" label="产品性质" labelCol="1" fieldCol="3" maxLength="64" />
<x:inputC name="productTechnologyName" required="false" label="制程工艺" labelCol="2" fieldCol="7"
maxLength="64" />
<div class="col-xs-12 col-sm-6" style="padding-top:5px">
<x:title title="正面颜色" name="group" hideTable="#info" />
<div id="fronColorsGrid" style="margin: 2px; height: 280px;"></div>
</div>
<div class="col-xs-12 col-sm-6" style="padding-top:5px">
<x:title title="反面颜色" name="group" hideTable="#info" />
<div id="backColorsGrid" style="margin: 2px; height: 280px;"></div>
</div>
<div class="hg-form-row">
<x:inputC name="productSubstrate" label="产品承印物" labelCol="1" fieldCol="7" maxLength="64" />
</div>
<div class="hg-form-row">
<x:inputC name="beerPlateNo" required="false" label="啤版编号" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="goldPlateNo" required="false" label="烫金版编号" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="dieCutPlateNo" required="false" label="模切版编号" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="copperpResinLateNo" required="false" label="铜版及树脂版编号" labelCol="1" fieldCol="1" maxLength="64" />
<x:inputC name="netPlateNo" required="false" label="网版编号" labelCol="1" fieldCol="3" maxLength="64" />
</div>
<div class="hg-form-row">
<x:inputC name="productTechnologyName" label="制程工艺" labelCol="1" fieldCol="7" maxLength="64" />
<x:inputC name="productProperty" label="产品性质" labelCol="1" fieldCol="3" maxLength="64" />
</div>
<div position="center" title="产品工序"> <div position="center" title="产品工序">
<div id="processedGrid" style="margin: 2px;"></div> <div id="processedGrid" style="margin: 2px;"></div>
</div> </div>
<x:inputC name="productTechnologyRequire" label="工艺要求" labelCol="1" fieldCol="2" maxLength="64" readonly="true"/> <div class="hg-form-row">
<x:inputC name="packageStyle" label="包装方式" labelCol="1" fieldCol="2" maxLength="64" /> <x:inputC name="productTechnologyRequire" label="工艺要求" labelCol="1" fieldCol="2" maxLength="64" readonly="true"/>
<x:inputC name="physicalTest" label="物性测试" labelCol="1" fieldCol="2" maxLength="64" /> <x:inputC name="packageStyle" label="包装方式" labelCol="1" fieldCol="2" maxLength="64" />
<x:inputC name="chemistryTest" label="化性测试" labelCol="1" fieldCol="2" maxLength="64" /> <x:inputC name="physicalTest" label="物性测试" labelCol="1" fieldCol="2" maxLength="64" />
<x:inputC name="chemistryTest" label="化性测试" labelCol="1" fieldCol="2" maxLength="64" />
</div>
<x:title title="产品材质" name="group" hideTable="#info" /> <x:title title="产品材质" name="group" hideTable="#info" />
<x:inputC name="productMaterial" label="产品材质" labelCol="1" fieldCol="11" maxLength="64" />
<x:inputC name="copperpNo" label="铜版编号" labelCol="1" fieldCol="2" maxLength="64" />
<x:inputC name="colorNoCard" label="色号卡" labelCol="1" fieldCol="2" maxLength="64" />
<x:inputC name="plateNo" label="模具编号" labelCol="1" fieldCol="2" maxLength="64" />
<x:inputC name="plasticBagStructure" label="塑胶袋结构" labelCol="1" fieldCol="2" maxLength="64" />
<x:textareaC name="productMaterial" label="产品材质" labelCol="1" fieldCol="5" rows="2" maxLength="64" />
<x:inputC name="plasticBagStructure" label="塑胶袋结构" labelCol="1" fieldCol="5" maxLength="64" />
<%-- <div class="col-xs-12 col-sm-6" style="padding-top:5px"></div>--%>
<div id="layout" style="height: 360px; display: contents;"> <div class="hg-form-row">
<div position="left" title="正面颜色" > <x:inputC name="copperpNo" label="铜版编号" labelCol="1" fieldCol="2" maxLength="64" />
<div id="fronColorsGrid" style="margin: 2px; height: 280px;"></div> <x:inputC name="colorNoCard" label="色号卡" labelCol="1" fieldCol="2" maxLength="64" />
</div> <x:inputC name="plateNo" label="模具编号" labelCol="1" fieldCol="2" maxLength="64" />
<div position="right" title="反面颜色">
<div id="backColorsGrid" style="margin: 2px; height: 280px;"></div>
</div>
</div> </div>
<%-- <x:textareaC cols="3" ></x:textareaC>--%>
</div> </div>
<div class="layout" id='lossFormDiv'> <div class="layout" id='lossFormDiv'>
<div id="productLossGrid" style="margin: 2px; height: 500px;"></div> <div id="productLossGrid" style="margin: 2px; height: 500px;"></div>
......
topsun/src/main/resources/config/content/easysearch/easy-search-product.xml
View file @ 2ca4e0fb
...@@ -16,6 +16,15 @@ ...@@ -16,6 +16,15 @@
</easy-search> </easy-search>
<easy-search name="productCode2" desc="产品">
<sql>
select t.product_category_id, t.product_category_name from product_category t
</sql>
<field name="类型ID" title="类型ID" code="productCategoryId" width="200" />
<field name="产品名称" title="产品名称" code="productCategoryName" width="200" />
</easy-search>
<easy-search name="productS" desc="产品"> <easy-search name="productS" desc="产品">
<sql> <sql>
select pa.product_id,pm.proofing_make_no select pa.product_id,pm.proofing_make_no
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment