Commit b5f6ba34 authored by 15008242619's avatar 15008242619

Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

parents ca917030 818fd5e2
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -50,7 +50,7 @@ export default { ...@@ -50,7 +50,7 @@ export default {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
/* background: #E8EDEF; */ /* background: #E8EDEF; */
padding: 0px 4px 4px 4px; /* padding: 0px 4px 4px 4px; */
box-sizing: border-box; box-sizing: border-box;
} }
.fixed-header+.app-main { .fixed-header+.app-main {
......
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
.sub-title{ .sub-title{
color: $themeColor; color: $themeColor;
} }
.el-table__body tr.current-row > td.el-table__cell{ .el-table__body tr.current-row > td:has(> .cell){
background: $themeTintColor; background: $themeTintColor;
} }
.right-hidden-box, .left-hidden-box{ .right-hidden-box, .left-hidden-box{
...@@ -388,9 +388,11 @@ ...@@ -388,9 +388,11 @@
} }
} }
.show-page-com{ .show-page-com {
.page-content-item{ margin-top: 0px!important;
.page-content-item {
.page-content-box{ .page-content-box{
border:0px!important;
.crumbs-title{ .crumbs-title{
color:#2f2f2f; color:#2f2f2f;
font-size:15px; font-size:15px;
......
...@@ -11,6 +11,13 @@ export default { ...@@ -11,6 +11,13 @@ export default {
defaultValue: '', defaultValue: '',
name: 'el-input' name: 'el-input'
} }
},
{
key: 'readOnly',
title: '只读',
component: {
name: 'el-checkbox'
}
} }
] ]
} }
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
v-model="item.progressTime" v-model="item.progressTime"
size="small" size="small"
type="date" type="date"
:disabled="itemObj.readOnly"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期" placeholder="选择日期"
/> />
...@@ -28,10 +29,10 @@ ...@@ -28,10 +29,10 @@
<!-- :rules="[ <!-- :rules="[
{required: true, message: '该项必填', trigger: 'blur'}, {required: true, message: '该项必填', trigger: 'blur'},
]" --> ]" -->
<el-input v-model="item.progressItem" autosize type="textarea" size="small" @change="changeVal" /> <el-input v-model="item.progressItem" :disabled="itemObj.readOnly" autosize type="textarea" size="small" @change="changeVal" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="2"> <el-col v-if="!itemObj.readOnly" :span="2">
<el-form-item class="btn-box"> <el-form-item class="btn-box">
<span v-if="index+1 == resultFormData.length" class="btn-item" title="新增" @click="addItem" @change="changeVal"> <span v-if="index+1 == resultFormData.length" class="btn-item" title="新增" @click="addItem" @change="changeVal">
<img src="/icons/c-add.png" alt=""> <img src="/icons/c-add.png" alt="">
......
...@@ -2537,11 +2537,13 @@ export default { ...@@ -2537,11 +2537,13 @@ export default {
this.initSupervise() this.initSupervise()
this.onresize() this.onresize()
this.init() this.init()
document.getElementsByClassName('page-content-item')[0].style['padding'] = '0px'
}, },
beforeDestroy() { beforeDestroy() {
// 销毁侦听器 // 销毁侦听器
const el = $('.assemble-kanban').parent()[0] const el = $('.assemble-kanban').parent()[0]
this.erd.uninstall(el) this.erd.uninstall(el)
document.getElementsByClassName('page-content-item')[0].style['padding'] = '4px'
}, },
methods: { methods: {
init() { init() {
...@@ -3043,7 +3045,8 @@ export default { ...@@ -3043,7 +3045,8 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.show-page-com .page-content-box .dee-as-com{ .show-page-com .page-content-box .dee-as-com{
overflow: hidden; padding:0px;
overflow: hidden;
} }
/deep/{ /deep/{
.assemble-kanban { .assemble-kanban {
......
...@@ -2490,12 +2490,14 @@ export default { ...@@ -2490,12 +2490,14 @@ export default {
this.initSupervise() this.initSupervise()
this.initSuperviseTable() this.initSuperviseTable()
this.init() this.init()
document.getElementsByClassName('page-content-item')[0].style['padding'] = '0px'
}, },
beforeDestroy() { beforeDestroy() {
// 销毁侦听器 // 销毁侦听器
const el = $('.experiment-kanban').parent()[0] const el = $('.experiment-kanban').parent()[0]
this.erd.uninstall(el) this.erd.uninstall(el)
document.getElementsByClassName('page-content-item')[0].style['padding'] = '4px'
}, },
methods: { methods: {
init() { init() {
...@@ -2917,9 +2919,11 @@ export default { ...@@ -2917,9 +2919,11 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.show-page-com .page-content-box .dee-as-com{ .show-page-com .page-content-box .dee-as-com{
overflow: hidden; padding:0px;
overflow: hidden;
} }
/deep/{.experiment-kanban { /deep/{
.experiment-kanban {
width: 1920px; width: 1920px;
height: 1080px; height: 1080px;
transform-origin: left top; transform-origin: left top;
......
...@@ -212,11 +212,13 @@ export default { ...@@ -212,11 +212,13 @@ export default {
this.getMaterial() this.getMaterial()
this.onresize() this.onresize()
this.init() this.init()
document.getElementsByClassName('page-content-item')[0].style['padding'] = '0px'
}, },
beforeDestroy() { beforeDestroy() {
// 销毁侦听器 // 销毁侦听器
const el = $('.production-kanban').parent()[0] const el = $('.production-kanban').parent()[0]
this.erd.uninstall(el) this.erd.uninstall(el)
document.getElementsByClassName('page-content-item')[0].style['padding'] = '4px'
}, },
methods: { methods: {
init() { init() {
...@@ -467,7 +469,8 @@ export default { ...@@ -467,7 +469,8 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.show-page-com .page-content-box .dee-as-com{ .show-page-com .page-content-box .dee-as-com{
overflow: hidden; padding:0px;
overflow: hidden;
} }
/deep/{ /deep/{
.production-kanban { .production-kanban {
......
...@@ -96,7 +96,7 @@ export default { ...@@ -96,7 +96,7 @@ export default {
}, },
// 组件方法 // 组件方法
methods: { methods: {
getPersonList(){ getPersonList() {
const httpParams = { const httpParams = {
'pageFrom': 1, 'pageFrom': 1,
'pageSize': 9999, 'pageSize': 9999,
......
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