Commit 2383274c authored by 刘学辉's avatar 刘学辉

物料/产品主数据修改

parent c79ea0a8
...@@ -87,15 +87,15 @@ ...@@ -87,15 +87,15 @@
fieldCol="11" disabled="true"/> fieldCol="11" disabled="true"/>
</div> </div>
<div class="hg-form-row" id="businessPersonnelList"> <div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/> <!--x:title title="业务人员" name="group"/-->
<div id="businessPersonnelListGrid" style="margin: 2px;"></div> <div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div> </div>
</div> </div>
<div class="hg-form-cols"> <%--div-- class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/> <x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div> </div>
</div> </div--%>
</form> </form>
<form class="hg-form" method="post" action="" style="display: none;" id="auditForm"> <form class="hg-form" method="post" action="" style="display: none;" id="auditForm">
......
...@@ -91,15 +91,15 @@ ...@@ -91,15 +91,15 @@
fieldCol="11" disabled="true"/> fieldCol="11" disabled="true"/>
</div> </div>
<div class="hg-form-row" id="businessPersonnelList"> <div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/> <!--x:title title="业务人员" name="group"/-->
<div id="businessPersonnelListGrid" style="margin: 2px;"></div> <div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div> </div>
</div> </div>
<div class="hg-form-cols"> <%--div-- class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/> <x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div> </div>
</div> </div--%>
</form> </form>
......
...@@ -174,7 +174,7 @@ function loadGrid() { ...@@ -174,7 +174,7 @@ function loadGrid() {
} }
function bindEvent(){ function bindEvent(){
$('#werksName').searchbox({ /*$('#werksName').searchbox({
type: "system", name: "dictionary", type: "system", name: "dictionary",
getParam: function (item) { getParam: function (item) {
return {fieldName: "WERKS"} return {fieldName: "WERKS"}
...@@ -183,7 +183,7 @@ function bindEvent(){ ...@@ -183,7 +183,7 @@ function bindEvent(){
$('#werks').val(data.WERKS); $('#werks').val(data.WERKS);
$('#werksName').val(data.NAME1); $('#werksName').val(data.NAME1);
} }
}); });*/
} }
/** /**
......
...@@ -95,15 +95,15 @@ ...@@ -95,15 +95,15 @@
fieldCol="11" disabled="true"/> fieldCol="11" disabled="true"/>
</div> </div>
<div class="hg-form-row" id="businessPersonnelList"> <div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/> <!--x:title title="业务人员" name="group"/-->
<div id="businessPersonnelListGrid" style="margin: 2px;"></div> <div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div> </div>
</div> </div>
<div class="hg-form-cols"> <%--div class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/> <x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div> </div>
</div> </div--%>
<%-- <x:title title="分类" name="group"/>--%> <%-- <x:title title="分类" name="group"/>--%>
<%-- <div class="hg-form-cols">--%> <%-- <div class="hg-form-cols">--%>
......
...@@ -107,9 +107,9 @@ function loadGrid() { ...@@ -107,9 +107,9 @@ function loadGrid() {
$("#specifications").attr("disabled",true); $("#specifications").attr("disabled",true);
$("#materialUsage").attr("disabled",true); $("#materialUsage").attr("disabled",true);
$("#werks").attr("disabled",true); // $("#werks").attr("disabled",true);
// $("#lgort").attr("disabled",true); // $("#lgort").attr("disabled",true);
UICtrl.disable($("#werksName"));
UICtrl.disable($("#businessUsage")); UICtrl.disable($("#businessUsage"));
UICtrl.disable($("#baseUnit")); UICtrl.disable($("#baseUnit"));
UICtrl.disable($("#itemAttributes")); UICtrl.disable($("#itemAttributes"));
......
...@@ -119,15 +119,15 @@ ...@@ -119,15 +119,15 @@
fieldCol="11" disabled="true"/> fieldCol="11" disabled="true"/>
</div> </div>
<div class="hg-form-row" id="businessPersonnelList"> <div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/> <!--x:title title="业务人员" name="group"/-->
<div id="businessPersonnelListGrid" style="margin: 2px;"></div> <div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div> </div>
</div> </div>
<div class="hg-form-cols"> <%--div-- class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/> <x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div> </div>
</div> </div--%>
</form> </form>
......
...@@ -102,11 +102,11 @@ ...@@ -102,11 +102,11 @@
<div id="businessPersonnelListGrid" style="margin: 2px;"></div> <div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div> </div>
</div> </div>
<div class="hg-form-cols"> <%--div-- class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/> <x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div> </div>
</div> </div--%>
<%-- <x:title title="分类" name="group"/>--%> <%-- <x:title title="分类" name="group"/>--%>
<%-- <div class="hg-form-cols">--%> <%-- <div class="hg-form-cols">--%>
......
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
</c:if> </c:if>
<div class="hg-form-row"> <div class="hg-form-row">
<x:title title="业务人员" name="group"/> <x:title id="personTitle" title="业务人员" name="group"/>
<div id="businessPersonnelListGrid" style="margin: 2px;"></div> <div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div> </div>
</div> </div>
......
...@@ -90,15 +90,15 @@ ...@@ -90,15 +90,15 @@
fieldCol="11" disabled="true"/> fieldCol="11" disabled="true"/>
</div> </div>
<div class="hg-form-row" id="businessPersonnelList"> <div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/> <!--x:title title="业务人员" name="group"/-->
<div id="businessPersonnelListGrid" style="margin: 2px;"></div> <div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div> </div>
</div> </div>
<div class="hg-form-cols"> <%--div-- class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/> <x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div> </div>
</div> </div--%>
</form> </form>
<form class="hg-form" method="post" action="" style="display: none;" id="auditForm"> <form class="hg-form" method="post" action="" style="display: none;" id="auditForm">
<div class=" border-left-top" style="margin-top: 10px;"> <div class=" border-left-top" style="margin-top: 10px;">
......
...@@ -96,15 +96,15 @@ ...@@ -96,15 +96,15 @@
fieldCol="11" disabled="true"/> fieldCol="11" disabled="true"/>
</div> </div>
<div class="hg-form-row" id="businessPersonnelList"> <div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/> <!--x:title title="业务人员" name="group"/-->
<div id="businessPersonnelListGrid" style="margin: 2px;"></div> <div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div> </div>
</div> </div>
<div class="hg-form-cols"> <%--div-- class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/> <x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div> </div>
</div> </div--%>
</form> </form>
......
...@@ -119,7 +119,7 @@ function loadGrid() { ...@@ -119,7 +119,7 @@ function loadGrid() {
UICtrl.disable($("#businessUsage")); UICtrl.disable($("#businessUsage"));
UICtrl.disable($("#baseUnit")); UICtrl.disable($("#baseUnit"));
UICtrl.disable($("#itemAttributes")); UICtrl.disable($("#itemAttributes"));
let coRowNum=$("#busiLens").val();
// let coRowNum = $("#businessUsage").val().replace(/,/g, '') + 1; // let coRowNum = $("#businessUsage").val().replace(/,/g, '') + 1;
// let length = dept.length; // let length = dept.length;
// let dept=$("#businessUsage").val().split(","); // let dept=$("#businessUsage").val().split(",");
...@@ -168,7 +168,7 @@ function loadGrid() { ...@@ -168,7 +168,7 @@ function loadGrid() {
usePager: false, usePager: false,
enabledEdit: true, enabledEdit: true,
width: "100%", width: "100%",
height: "90%",//coRowNum * 37.5, height:coRowNum * 37.5,
heightDiff: -8, heightDiff: -8,
fixedCellHeight: true, fixedCellHeight: true,
selectRowButtonOnly: true, selectRowButtonOnly: true,
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<form class="hg-form" method="post" action="" id="submitForm"> <form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态--> <x:hidden name="active"/> <!--状态-->
<x:hidden name="meId"/> <!--状态--> <x:hidden name="meId"/> <!--状态-->
<x:hidden name="busiLens" />
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox"> <div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i <button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
class="fa fa-save"></i>保存 class="fa fa-save"></i>保存
...@@ -113,15 +114,15 @@ ...@@ -113,15 +114,15 @@
fieldCol="11" disabled="true"/> fieldCol="11" disabled="true"/>
</div> </div>
<div class="hg-form-row" id="businessPersonnelList"> <div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/> <!--x:title title="业务人员" name="group"/-->
<div id="businessPersonnelListGrid" style="margin: 2px;"></div> <div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div> </div>
</div> </div>
<div class="hg-form-cols"> <%--div class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/> <x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div> </div>
</div> </div--%>
</form> </form>
<form class="hg-form" method="post" action="" style="display: none;" id="auditForm"> <form class="hg-form" method="post" action="" style="display: none;" id="auditForm">
<div class=" border-left-top" style="margin-top: 10px;"> <div class=" border-left-top" style="margin-top: 10px;">
......
...@@ -94,15 +94,15 @@ ...@@ -94,15 +94,15 @@
fieldCol="11" disabled="true"/> fieldCol="11" disabled="true"/>
</div> </div>
<div class="hg-form-row" id="businessPersonnelList"> <div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/> <!--x:title title="业务人员" name="group"/-->
<div id="businessPersonnelListGrid" style="margin: 2px;"></div> <div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div> </div>
</div> </div>
<div class="hg-form-cols"> <%--div class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/> <x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div> </div>
</div> </div--%>
<%-- <x:title title="分类" name="group"/>--%> <%-- <x:title title="分类" name="group"/>--%>
<%-- <div class="hg-form-cols">--%> <%-- <div class="hg-form-cols">--%>
......
...@@ -105,15 +105,15 @@ ...@@ -105,15 +105,15 @@
fieldCol="11" disabled="true"/> fieldCol="11" disabled="true"/>
</div> </div>
<div class="hg-form-row" id="businessPersonnelList"> <div class="hg-form-row" id="businessPersonnelList">
<x:title title="业务人员" name="group"/> <!--x:title title="业务人员" name="group"/-->
<div id="businessPersonnelListGrid" style="margin: 2px;"></div> <div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div> </div>
</div> </div>
<div class="hg-form-cols"> <%--div class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/> <x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div> </div>
</div> </div--%>
</form> </form>
......
...@@ -223,7 +223,11 @@ public class NonProdApplyNextController extends CommonController { ...@@ -223,7 +223,11 @@ public class NonProdApplyNextController extends CommonController {
NonProdApplyBaseInfo baseInfo = nonProdApplyApplication.loadNonProdApplyBaseInfoById(nonProdApplyDept.getBaseInfoId()); NonProdApplyBaseInfo baseInfo = nonProdApplyApplication.loadNonProdApplyBaseInfoById(nonProdApplyDept.getBaseInfoId());
nonProdApplyDept.setBusinessCode(circulate.get("deptCode").toString()); nonProdApplyDept.setBusinessCode(circulate.get("deptCode").toString());
getBaseInfoAttrs(baseInfo,nonProdApplyDept); getBaseInfoAttrs(baseInfo,nonProdApplyDept);
int slen=1;
if (StringUtil.isNotBlank(baseInfo.getBusinessUsage())){
slen=baseInfo.getBusinessUsage().split(",").length+1;
}
this.putAttribute("busiLens",slen);
String businessCode=circulate.get("deptCode").toString(); String businessCode=circulate.get("deptCode").toString();
switch (businessCode) { switch (businessCode) {
case "K": case "K":
......
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