Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TF-MOM-WEB
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
TFMOM
TF-MOM-WEB
Commits
6d803eff
Commit
6d803eff
authored
Oct 25, 2023
by
jingnan
👀
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://94.191.100.41/tfmom/tf-mom-web
into dev
parents
bbe93179
3899c307
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
131 additions
and
6 deletions
+131
-6
index.vue
...src/privateComponents/components/AssignCradInfo/index.vue
+54
-0
config.js
.../src/privateComponents/components/LacquerFreeze/config.js
+29
-0
index.vue
.../src/privateComponents/components/LacquerFreeze/index.vue
+10
-5
config.js
...s/src/privateComponents/components/ViscosityBox/config.js
+29
-0
index.vue
...s/src/privateComponents/components/ViscosityBox/index.vue
+8
-0
Table2.vue
...on/components/TechnicalRequirements/components/Table2.vue
+1
-1
No files found.
applications/dee-mes/src/privateComponents/components/AssignCradInfo/index.vue
0 → 100644
View file @
6d803eff
<
template
>
<div
class=
"AssignCradInfo"
>
<dee-as-com
ref=
"detailCom"
dis-business
:lay-config=
"cmpOptions"
:basic-data=
"basicData"
/>
</div>
</
template
>
<
script
>
export
default
{
name
:
'AssignCradInfo'
,
componentName
:
'调配卡详情'
,
components
:
{},
props
:
{
basicData
:
{
type
:
Object
,
default
:
()
=>
null
}
},
data
()
{
return
{
cmpOptions
:
{}
}
},
watch
:
{
basicData
:
{
immediate
:
true
,
deep
:
true
,
handler
:
function
(
val
)
{
if
(
val
.
subTypeName
===
'AssignCardAlodine'
)
{
this
.
cmpOptions
=
{
typeName
:
'AssignCardAlodine'
,
layKey
:
'assignCardInfo'
}
}
else
if
(
val
.
subTypeName
===
'AssignCardLacquer'
)
{
this
.
cmpOptions
=
{
typeName
:
'AssignCardLacquer'
,
layKey
:
'assignCardInfo'
}
}
else
{
this
.
cmpOptions
=
{
typeName
:
'AssignCardPaint'
,
layKey
:
'assignCardInfo'
}
}
}
}
}
}
</
script
>
<
style
lang=
'scss'
>
</
style
>
applications/dee-mes/src/privateComponents/components/LacquerFreeze/config.js
0 → 100644
View file @
6d803eff
export
default
{
layoutConfigData
:
[
{
title
:
'高级组件配置'
,
data
:
[
{
key
:
'readOnly'
,
title
:
'只读'
,
component
:
{
name
:
'el-checkbox'
}
}
]
}
],
data
()
{
return
{
}
},
created
()
{
},
computed
:
{
},
methods
:
{
}
}
applications/dee-mes/src/privateComponents/components/LacquerFreeze/index.vue
View file @
6d803eff
...
...
@@ -16,7 +16,7 @@
class=
"input-with-select el-input--small"
placeholder=
"请输入剩余施工期"
clearable
:disabled=
"
disabled
"
:disabled=
"
itemObj.readOnly
"
type=
"Number"
/>
</el-form-item>
...
...
@@ -29,7 +29,7 @@
class=
"input-with-select el-input--small"
placeholder=
"请选择失效期"
style=
"width: 220px"
:disabled=
"
disabled
"
:disabled=
"
itemObj.readOnly
"
format=
"yyyy 年 MM 月 dd 日 HH:mm"
value-format=
"yyyy-MM-dd HH:mm:ss"
/>
...
...
@@ -39,7 +39,7 @@
<el-form-item
label=
""
prop=
"isFreezing"
>
<el-radio-group
v-model=
"form.isFreezing"
:disabled=
"
disabled
"
:disabled=
"
itemObj.readOnly
"
>
<el-radio
:label=
"true"
>
需要
</el-radio>
<el-radio
:label=
"false"
>
不需要
</el-radio>
...
...
@@ -53,7 +53,7 @@
placeholder=
"请输入冷冻温度/℃"
clearable
class=
"input-with-select el-input--small"
:disabled=
"
disabled
"
:disabled=
"
itemObj.readOnly
"
type=
"Number"
/>
</el-form-item>
...
...
@@ -81,6 +81,7 @@
</div>
</
template
>
<
script
>
import
config
from
'./config'
import
Dialog
from
'./dialog'
import
{
post
}
from
'@/utils/http'
export
default
{
...
...
@@ -89,6 +90,7 @@ export default {
components
:
{
Dialog
},
mixins
:
[
config
],
props
:
{
basicData
:
{
type
:
Object
,
...
...
@@ -97,11 +99,14 @@ export default {
form
:
{
type
:
Object
,
default
:
()
=>
null
},
itemObj
:
{
type
:
Object
,
default
:
null
}
},
data
()
{
return
{
disabled
:
false
,
loading
:
false
,
// 左侧行ID
cardId
:
null
,
...
...
applications/dee-mes/src/privateComponents/components/ViscosityBox/config.js
0 → 100644
View file @
6d803eff
export
default
{
layoutConfigData
:
[
{
title
:
'高级组件配置'
,
data
:
[
{
key
:
'readOnly'
,
title
:
'只读'
,
component
:
{
name
:
'el-checkbox'
}
}
]
}
],
data
()
{
return
{
}
},
created
()
{
},
computed
:
{
},
methods
:
{
}
}
applications/dee-mes/src/privateComponents/components/ViscosityBox/index.vue
View file @
6d803eff
...
...
@@ -5,6 +5,7 @@
class=
"input-with-select el-input--small"
placeholder=
""
clearable
:disabled=
"itemObj.readOnly"
style=
"width: 40%"
@
change=
"change"
/>
...
...
@@ -14,6 +15,7 @@
class=
"input-with-select el-input--small"
placeholder=
""
clearable
:disabled=
"itemObj.readOnly"
style=
"width: 40%"
@
change=
"change"
/>
...
...
@@ -21,13 +23,19 @@
</div>
</
template
>
<
script
>
import
config
from
'./config'
export
default
{
name
:
'ViscosityBox'
,
componentName
:
'黏度框'
,
mixins
:
[
config
],
props
:
{
form
:
{
type
:
Object
,
default
:
()
=>
null
},
itemObj
:
{
type
:
Object
,
default
:
null
}
},
data
()
{
...
...
applications/dee-mes/src/views/taskExecution/components/TechnicalRequirements/components/Table2.vue
View file @
6d803eff
...
...
@@ -134,7 +134,7 @@ export default {
}
// eslint-disable-next-line no-undef
const
baseURl
=
`
${
VUE_APP_BASE_API
||
process
.
env
.
VUE_APP_BASE_API
}
`
const
user
=
27200113
const
user
=
'wcadmin'
console
.
log
(
row
.
docsUrl
+
user
)
axios
({
method
:
'get'
,
...
...
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