Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
topsun-bpm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
鲁鑫
topsun-bpm
Commits
67b58d7d
Commit
67b58d7d
authored
Oct 09, 2024
by
鲁鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ECN变更的其他(包含成品和原材料变更)改为非必填
parent
38d3dc64
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
epChangeFormDetail.jsp
...c/main/webapp/biz/topsun/ep/change/epChangeFormDetail.jsp
+2
-2
epMaterialChangeFormDetail.jsp
...ebapp/biz/topsun/ep/change/epMaterialChangeFormDetail.jsp
+2
-2
epChangeForm.ftl
...xt/src/main/webapp/template/print/topsun/epChangeForm.ftl
+3
-1
No files found.
topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.jsp
View file @
67b58d7d
...
@@ -69,7 +69,7 @@
...
@@ -69,7 +69,7 @@
<%-- <x:inputC name="othersMaterialStore" required="false" label="涉及原材料成品库存" labelCol="2" fieldCol="10"/>--%>
<%-- <x:inputC name="othersMaterialStore" required="false" label="涉及原材料成品库存" labelCol="2" fieldCol="10"/>--%>
<%-- </div>--%>
<%-- </div>--%>
<div
class=
"hg-form-row"
>
<div
class=
"hg-form-row"
>
<x:inputC
name=
"others"
required=
"
tru
e"
label=
"其他"
labelCol=
"2"
fieldCol=
"10"
/>
<x:inputC
name=
"others"
required=
"
fals
e"
label=
"其他"
labelCol=
"2"
fieldCol=
"10"
/>
</div>
</div>
<x:title
title=
"REVISED SPEC 变更后产品信息"
name=
"group"
/>
<x:title
title=
"REVISED SPEC 变更后产品信息"
name=
"group"
/>
<div
class=
"hg-form-row"
>
<div
class=
"hg-form-row"
>
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
<x:textareaC
name=
"changedMaterial"
required=
"true"
label=
"原材料"
labelCol=
"2"
fieldCol=
"10"
rows=
"3"
/>
<x:textareaC
name=
"changedMaterial"
required=
"true"
label=
"原材料"
labelCol=
"2"
fieldCol=
"10"
rows=
"3"
/>
</div>
</div>
<div
class=
"hg-form-row"
>
<div
class=
"hg-form-row"
>
<x:inputC
name=
"changedOthers"
required=
"
tru
e"
label=
"其他"
labelCol=
"2"
fieldCol=
"10"
/>
<x:inputC
name=
"changedOthers"
required=
"
fals
e"
label=
"其他"
labelCol=
"2"
fieldCol=
"10"
/>
</div>
</div>
</div>
</div>
<div
style=
"padding-top: 15px;"
>
<div
style=
"padding-top: 15px;"
>
...
...
topsun-xt/src/main/webapp/biz/topsun/ep/change/epMaterialChangeFormDetail.jsp
View file @
67b58d7d
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
<x:inputC
name=
"othersMaterialStore"
required=
"false"
label=
"涉及原材料成品库存"
labelCol=
"2"
fieldCol=
"10"
/>
<x:inputC
name=
"othersMaterialStore"
required=
"false"
label=
"涉及原材料成品库存"
labelCol=
"2"
fieldCol=
"10"
/>
</div>
</div>
<div
class=
"hg-form-row"
>
<div
class=
"hg-form-row"
>
<x:inputC
name=
"others"
required=
"
tru
e"
label=
"其他"
labelCol=
"2"
fieldCol=
"10"
/>
<x:inputC
name=
"others"
required=
"
fals
e"
label=
"其他"
labelCol=
"2"
fieldCol=
"10"
/>
</div>
</div>
<x:title
title=
"REVISED SPEC 变更后产品信息"
name=
"group"
/>
<x:title
title=
"REVISED SPEC 变更后产品信息"
name=
"group"
/>
<div
class=
"hg-form-row"
>
<div
class=
"hg-form-row"
>
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
<x:inputC
name=
"changedProductName"
required=
"true"
label=
"产品名称"
labelCol=
"2"
fieldCol=
"10"
/>
<x:inputC
name=
"changedProductName"
required=
"true"
label=
"产品名称"
labelCol=
"2"
fieldCol=
"10"
/>
</div>
</div>
<div
class=
"hg-form-row"
>
<div
class=
"hg-form-row"
>
<x:inputC
name=
"changedOthers"
required=
"
tru
e"
label=
"其他"
labelCol=
"2"
fieldCol=
"10"
/>
<x:inputC
name=
"changedOthers"
required=
"
fals
e"
label=
"其他"
labelCol=
"2"
fieldCol=
"10"
/>
</div>
</div>
</div>
</div>
<div
style=
"padding-top: 15px;"
>
<div
style=
"padding-top: 15px;"
>
...
...
topsun-xt/src/main/webapp/template/print/topsun/epChangeForm.ftl
View file @
67b58d7d
...
@@ -18,12 +18,14 @@
...
@@ -18,12 +18,14 @@
<img
src=
'data:image/jpg;base64,${bsnPng}'
width=
"100px"
/>
<img
src=
'data:image/jpg;base64,${bsnPng}'
width=
"100px"
/>
</span>
</span>
宝绅内部变更申请/通知单
</div>
宝绅内部变更申请/通知单
</div>
<div
class=
"billTitle"
>
Specification Change Form
</div>
<div
class=
"billTitle"
>
Engineering Change Notice
</div>
<table
cellspacing=
"0px"
cellpadding=
"0px"
class=
"tablePrint"
>
<table
cellspacing=
"0px"
cellpadding=
"0px"
class=
"tablePrint"
>
<colgroup>
<colgroup>
<col
width=
"34%"
/>
<col
width=
"34%"
/>
<col
width=
"34%"
/>
</colgroup>
</colgroup>
<tr>
<tr>
<td
class=
"left"
>
${changeNo?default("")?html}
</td>
<td
class=
"right"
>
变更编号SCF#:${billCode?default("")?html}
</td>
<td
class=
"right"
>
变更编号SCF#:${billCode?default("")?html}
</td>
</tr>
</tr>
</table>
</table>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment