Skip to content

T
TF-MOM-WEB
Commit 346763d4 authored by wangdanlei's avatar wangdanlei
Browse files
Options

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

parents e6e59bbe fdbe82eb
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 22 deletions
applications/dee-mes/src/views/assemblyPlanManagement/stationPlanMaintenance/stationPlanList.vue
View file @ 346763d4
...@@ -51,7 +51,9 @@ ...@@ -51,7 +51,9 @@
<i :class="'tree' + node.level" /> <i :class="'tree' + node.level" />
<span v-if="node.level === 1" class="label change-text" :title="data.serialNumber">{{ data.serialNumber }}</span> <span v-if="node.level === 1" class="label change-text" :title="data.serialNumber">{{ data.serialNumber }}</span>
<span v-if="node.level === 2" class="change-text">{{ data.serialNumber + '，' + data.name }}</span> <span v-if="node.level === 2" class="change-text">{{ data.serialNumber + '，' + data.name }}</span>
<span v-if="node.level === 3" class="change-text" :class="[data.target.isOk ?'Delivery':'Finish']">{{ data.target.serialNumber + '，' + data.target.name }}</span> <span v-if="node.level === 3&& data.target" class="change-text" :class="[data.target.isOk ?'Delivery':'Finish']">{{ data.target.serialNumber + '，' + data.target.name }}</span>
<span v-if="data.name==='转移工作包'" class="change-text Reserved">{{ data.name }}</span>
<span v-if="node.level === 4" class="change-text" :class="[data.isOk ?'Delivery':'Finish']">{{ data.serialNumber + '，' + data.name }}</span>
</span> </span>
</span> </span>
</el-tree> </el-tree>
...@@ -499,7 +501,7 @@ export default { ...@@ -499,7 +501,7 @@ export default {
item.extPositionLinks.forEach(element => { item.extPositionLinks.forEach(element => {
element.leaf = true element.leaf = true
}) })
item.children = item.extPositionLinks item.children = [...item.extPositionLinks, { name: '转移工作包', children: [], id: parseInt(Math.random() * 100000000000000, 10) }]
} }
}) })
this.treeData = [ this.treeData = [
...@@ -590,30 +592,90 @@ export default { ...@@ -590,30 +592,90 @@ export default {
}) })
}, },
handleNodeClick(data, node) { handleNodeClick(data, node) {
data.activeTab = this.activeTab if (data.name === '转移工作包') {
data.level = node.level this.getQueryRetention(data, node)
data.searchStories = this.form.sortiesName } else {
this.activeNodeData = data data.activeTab = this.activeTab
if (node.level === 2 || node.level === 3) { data.level = node.level
this.$nextTick(() => { data.searchStories = this.form.sortiesName
if (this.activeTab === '0') { this.activeNodeData = data
if (this.$refs.detailCom.$refs.asCom && this.$refs.detailCom.$refs.asCom.getData) { if (node.level === 2 || node.level === 3) {
this.$refs.detailCom.$refs.asCom.getData(data) this.$nextTick(() => {
this.$emit('getMissData', null) if (this.activeTab === '0') {
} if (this.$refs.detailCom.$refs.asCom && this.$refs.detailCom.$refs.asCom.getData) {
} else if (this.activeTab === '1') { this.$refs.detailCom.$refs.asCom.getData(data)
if (this.$refs.detailCom2.$refs.asCom && this.$refs.detailCom2.$refs.asCom.getData) { this.$emit('getMissData', null)
this.$refs.detailCom2.$refs.asCom.getData(data) }
this.$emit('getMissData', null) } else if (this.activeTab === '1') {
if (this.$refs.detailCom2.$refs.asCom && this.$refs.detailCom2.$refs.asCom.getData) {
this.$refs.detailCom2.$refs.asCom.getData(data)
this.$emit('getMissData', null)
}
} else if (this.activeTab === '2') {
if (this.$refs.detailComSI2.$refs.asCom && this.$refs.detailComSI2.$refs.asCom.getData) {
this.$refs.detailComSI2.$refs.asCom.getData(data)
this.$emit('getMissData', null)
}
} }
} else if (this.activeTab === '2') { })
if (this.$refs.detailComSI2.$refs.asCom && this.$refs.detailComSI2.$refs.asCom.getData) { }
this.$refs.detailComSI2.$refs.asCom.getData(data) }
this.$emit('getMissData', null) },
getQueryRetention(data, node) {
const params = {
'searchItems': {
'children': [
{
'items': [
{
'fieldName': 'state',
'operator': 'EQ',
'value': 'Approved'
},
{
'fieldName': 'enterPosition',
'operator': 'EQ',
'value': node.parent.data && node.parent.data.serialNumber || ''
},
{
'fieldName': 'sorties',
'operator': 'EQ',
'value': this.form.sortiesName || ''
}
],
'operator': 'AND'
} }
],
'items': [],
'operator': 'AND'
},
'openProps': [
{
'name': 'extRetentionPlanLinks'
} }
}) ],
'sortItem': [
{
'fieldName': 'createTime',
'sortOrder': 'desc'
}
]
} }
post(`/ExtRetention/queryRetention`, params)
.then((res) => {
const newChildren = res.items && res.items.map(item => {
item.leaf = true
return item
})
if (newChildren) {
this.$refs.tree.updateKeyChildren(node.key, newChildren)
this.defaultExpandedKeys = [node.key]
}
}).catch(err => {
console.log(err)
}).finally(() => {
})
}, },
getCurrentData(data) { getCurrentData(data) {
if (data.level === 2 || data.level === 3) { if (data.level === 2 || data.level === 3) {
......
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