Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
Project
Project
Details
Activity
Releases
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
周远喜
mes-ui
Commits
1d9c2ce6
Commit
1d9c2ce6
authored
Oct 26, 2020
by
zhanglongtao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工序编辑页面添加字段
parent
05765173
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
95 additions
and
17 deletions
+95
-17
zh-CN.js
i18n/locale/zh-CN.js
+1
-1
add.vue
pages/technology/details/add.vue
+48
-8
edit.vue
pages/technology/details/edit.vue
+46
-8
No files found.
i18n/locale/zh-CN.js
View file @
1d9c2ce6
...
...
@@ -1244,7 +1244,7 @@ export default {
remark
:
'备注'
,
extend
:
'扩展字段'
,
outsideTime
:
'外协工期'
,
performanceHours
:
'绩效工时'
,
performanceHours
:
'绩效
单件
工时'
,
isImportantResources
:
'关重资源'
,
schedulingWorkingHours
:
'*排产准结工时'
,
//准备工时?
realWorkingHours
:
'实作准结工时'
,
...
...
pages/technology/details/add.vue
View file @
1d9c2ce6
...
...
@@ -85,22 +85,39 @@
</Col>
<Col
:span=
"6"
>
<FormItem
:label=
"l('equipType')"
prop=
"equipTypeId"
>
<EquipTypeSelect
v-model=
"entity.equipTypeId"
@
on-change=
"equipChange"
></EquipTypeSelect>
<EquipTypeSelect
v-model=
"entity.equipTypeId"
@
on-change=
"equipChange"
></EquipTypeSelect>
</FormItem>
</Col>
<Col
:span=
"6"
>
<FormItem
:label=
"l('resourceType')"
prop=
"resourceType"
>
<ResourceSelect
v-model=
"entity.resource"
@
on-change=
"resourceChange"
></ResourceSelect>
<ResourceSelect
v-model=
"entity.resource"
@
on-change=
"resourceChange"
></ResourceSelect>
</FormItem>
</Col>
<Col
:span=
"6"
>
<FormItem
:label=
"l('isImportant')"
prop=
"isImportant"
>
<Dictionary
code=
"Process.state"
v-model=
"entity.isImportant"
type=
"radio"
></Dictionary>
<Dictionary
code=
"Process.state"
v-model=
"entity.isImportant"
type=
"radio"
></Dictionary>
</FormItem>
</Col>
<Col
:span=
"6"
>
<FormItem
:label=
"l('isParticipateIntime')"
prop=
"isParticipateIntime"
>
<Dictionary
code=
"Process.state"
v-model=
"entity.isParticipateIntime"
type=
"radio"
></Dictionary>
<FormItem
:label=
"l('isParticipateIntime')"
prop=
"isParticipateIntime"
>
<Dictionary
code=
"Process.state"
v-model=
"entity.isParticipateIntime"
type=
"radio"
></Dictionary>
</FormItem>
</Col>
<!--
<Col
:span=
"8"
>
...
...
@@ -128,6 +145,19 @@
<InputTime
v-model=
"entity.realWorkingHours"
/>
</FormItem>
</Col>
-->
<Col
:span=
"12"
>
<FormItem
:label=
"l('performanceWorkingHours')"
prop=
"performanceWorkingHours"
>
<InputTime
v-model=
"entity.performanceWorkingHours"
/>
</FormItem>
</Col>
<Col
:span=
"12"
>
<FormItem
:label=
"l('performanceHours')"
prop=
"performanceHours"
>
<InputTime
v-model=
"entity.performanceHours"
/>
</FormItem>
</Col>
<Col
:span=
"4"
>
<FormItem
:label=
"l('efficiencyValue')"
prop=
"efficiencyValue"
>
<InputNumber
v-model=
"entity.efficiencyValue"
></InputNumber>
...
...
@@ -144,11 +174,14 @@
code=
"Process.state"
v-model=
"entity.isOutside"
type=
"radio"
style=
"height:20px"
style=
"height:
20px"
></Dictionary>
</FormItem>
</Col>
<Col
:span=
"12"
:style=
"
{visibility:entity.isOutside==1?'visible':'hidden'}">
<Col
:span=
"12"
:style=
"
{ visibility: entity.isOutside == 1 ? 'visible' : 'hidden' }"
>
<FormItem
:label=
"l('outsideTime')"
prop=
"outsideTime"
>
<InputTime
v-model=
"entity.outsideTime"
/>
</FormItem>
...
...
@@ -156,7 +189,12 @@
<Divider
/>
<Col
:span=
"24"
>
<FormItem
:label=
"l('taskContent')"
prop=
"taskContent"
>
<i-quill
v-model=
"entity.taskContent"
:height=
"260"
v-paste=
"handleImg"
border
/>
<i-quill
v-model=
"entity.taskContent"
:height=
"260"
v-paste=
"handleImg"
border
/>
</FormItem>
</Col>
</Row>
...
...
@@ -196,6 +234,8 @@ export default {
realRuntime
:
0
,
isParticipateIntime
:
0
,
equipType
:
""
,
performanceWorkingHours
:
0
,
performanceHours
:
0
,
},
rules
:
{
name
:
[{
required
:
true
,
message
:
"必填"
,
trigger
:
"blur"
}],
...
...
pages/technology/details/edit.vue
View file @
1d9c2ce6
...
...
@@ -85,22 +85,39 @@
</Col>
<Col
:span=
"6"
>
<FormItem
:label=
"l('equipType')"
prop=
"equipTypeId"
>
<EquipTypeSelect
v-model=
"entity.equipTypeId"
@
on-change=
"equipChange"
></EquipTypeSelect>
<EquipTypeSelect
v-model=
"entity.equipTypeId"
@
on-change=
"equipChange"
></EquipTypeSelect>
</FormItem>
</Col>
<Col
:span=
"6"
>
<FormItem
:label=
"l('resourceType')"
prop=
"resourceType"
>
<ResourceSelect
v-model=
"entity.resource"
@
on-change=
"resourceChange"
></ResourceSelect>
<ResourceSelect
v-model=
"entity.resource"
@
on-change=
"resourceChange"
></ResourceSelect>
</FormItem>
</Col>
<Col
:span=
"6"
>
<FormItem
:label=
"l('isImportant')"
prop=
"isImportant"
>
<Dictionary
code=
"Process.state"
v-model=
"entity.isImportant"
type=
"radio"
></Dictionary>
<Dictionary
code=
"Process.state"
v-model=
"entity.isImportant"
type=
"radio"
></Dictionary>
</FormItem>
</Col>
<Col
:span=
"6"
>
<FormItem
:label=
"l('isParticipateIntime')"
prop=
"isParticipateIntime"
>
<Dictionary
code=
"Process.state"
v-model=
"entity.isParticipateIntime"
type=
"radio"
></Dictionary>
<FormItem
:label=
"l('isParticipateIntime')"
prop=
"isParticipateIntime"
>
<Dictionary
code=
"Process.state"
v-model=
"entity.isParticipateIntime"
type=
"radio"
></Dictionary>
</FormItem>
</Col>
<!--
<Col
:span=
"8"
>
...
...
@@ -128,6 +145,19 @@
<InputTime
v-model=
"entity.realWorkingHours"
/>
</FormItem>
</Col>
-->
<Col
:span=
"12"
>
<FormItem
:label=
"l('performanceWorkingHours')"
prop=
"performanceWorkingHours"
>
<InputTime
v-model=
"entity.performanceWorkingHours"
/>
</FormItem>
</Col>
<Col
:span=
"12"
>
<FormItem
:label=
"l('performanceHours')"
prop=
"performanceHours"
>
<InputTime
v-model=
"entity.performanceHours"
/>
</FormItem>
</Col>
<Col
:span=
"4"
>
<FormItem
:label=
"l('efficiencyValue')"
prop=
"efficiencyValue"
>
<InputNumber
v-model=
"entity.efficiencyValue"
></InputNumber>
...
...
@@ -144,11 +174,14 @@
code=
"Process.state"
v-model=
"entity.isOutside"
type=
"radio"
style=
"height:20px"
style=
"height:
20px"
></Dictionary>
</FormItem>
</Col>
<Col
:span=
"12"
:style=
"
{visibility:entity.isOutside==1?'visible':'hidden'}">
<Col
:span=
"12"
:style=
"
{ visibility: entity.isOutside == 1 ? 'visible' : 'hidden' }"
>
<FormItem
:label=
"l('outsideTime')"
prop=
"outsideTime"
>
<InputTime
v-model=
"entity.outsideTime"
/>
</FormItem>
...
...
@@ -156,7 +189,12 @@
<Divider
/>
<Col
:span=
"24"
>
<FormItem
:label=
"l('taskContent')"
prop=
"taskContent"
>
<i-quill
v-model=
"entity.taskContent"
:height=
"260"
v-paste=
"handleImg"
border
/>
<i-quill
v-model=
"entity.taskContent"
:height=
"260"
v-paste=
"handleImg"
border
/>
</FormItem>
</Col>
</Row>
...
...
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