Skip to content

T
TF-MOM-WEB
Commit 4fcb3dd1 authored by “lixuyan”'s avatar “lixuyan”
Browse files
Options

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

parents 7fa1e0a7 4df8e3a6
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 168 deletions
applications/architecture-dee/src/layout/components/Sidebar/SidebarItem.vue
View file @ 4fcb3dd1
......@@ -184,9 +184,10 @@ export default {
.el-submenu__title::after {
border-bottom: 4px solid white;
}
.menu-m-icon {
filter: brightness(100);
.el-submenu__title:hover{
.menu-m-icon {
filter: brightness(100);
}
}
}
}
......
applications/architecture-dee/src/layout/components/Sidebar/index.vue
View file @ 4fcb3dd1
......@@ -3,7 +3,7 @@
<el-scrollbar v-show="isCollapse && !$route.query.showMenu" wrap-class="scrollbar-wrapper">
<el-menu
:default-active="activeMenu"
:collapse="true"
:collapse="false"
background-color="inherit"
:text-color="variables.menuText"
:unique-opened="false"
......
applications/architecture-dee/src/styles/sidebar.scss
View file @ 4fcb3dd1
......@@ -63,7 +63,8 @@
.menu-m-icon,
.svg-icon {
margin-right: 16px;
margin-right: 8px;
margin-left: 4px;
}
.el-menu {
......@@ -265,7 +266,7 @@
.el-menu-item {
// padding: 0px !important;
color: #212121 !important;
height: 42px !important;
height: 30px !important;
//margin: 16px 0 !important;
}
......
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/warehouseConfirm/index.vue
View file @ 4fcb3dd1
......@@ -19,7 +19,6 @@
</template>
<script>
import { post } from '@/utils/http'
export default {
name: 'WarehouseConfirm',
components: {},
......@@ -38,13 +37,11 @@ export default {
computed: {},
watch: {},
created() {
// this.searchInStorageRequestItem()
},
mounted() {
this.$bus.$on('refreshBatchSignDetails', () => {
this.$nextTick(() => {
this.$refs.applyTable && this.$refs.applyTable.$refs.asCom.getData()
// this.searchInStorageRequestItem()
})
})
},
......@@ -52,165 +49,6 @@ export default {
methods: {
selectionChange(val) {
this.selectionRows = val
},
searchInStorageRequestItem() {
console.log(this, 'this')
// const searchData = obtainedParams.searchFormData ? obtainedParams.searchFormData.items : []
// const extraItems = obtainedParams.extraBaseParams || []
const param = {
'rootCondition': {
'pageFrom': 1,
'pageSize': 999,
'searchItems': {
'children': [
{
'items': [
{
'fieldName': 'parentId',
'operator': 'ISNULL'
}
// ...extraItems,
// ...searchData
],
'operator': 'AND'
}
],
'items': []
},
'parentFilter': true,
'openProps': [{
'name': 'inventoryReq',
'openProps': [
{
'name': 'materialType'
}
]
},
{
'name': 'extMaterial',
'openProps': [
{
'name': 'extUnit'
}
]
},
{
'name': 'extDxSipplier'
},
{
'name': 'storageZone'
},
{
'name': 'purchaseUnit'
},
{
'name': 'inventoryJobResponses',
'openProps': [
{
'name': 'extWorkUnit'
},
{ 'name': 'inventory'
}
]
}
],
'sortItem': [
{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}
]
},
'childCondition': {
'pageFrom': 1,
'pageSize': 9999,
'searchItems': {
'children': [],
'items': []
},
'openProps': [{
'name': 'inventoryReq',
'openProps': [
{
'name': 'materialType'
}
]
},
{
'name': 'extMaterial',
'openProps': [
{
'name': 'extUnit'
}
]
},
{
'name': 'extDxSipplier'
},
{
'name': 'storageZone'
},
{
'name': 'purchaseUnit'
},
{
'name': 'inventoryJobResponses',
'openProps': [
{
'name': 'extWorkUnit'
}
]
}
],
'sortItem': [
{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}
]
}
}
// this.resultData = []
const requestURL = 'InStorageRequestItem/search/wfcInventoryItem?taskDefinitionKey=' + this.selectData.taskKey
post(requestURL, param).then(res => {
const data = res.items.content
this.treeTableNoArrange(data)
// this.pagination.total = data.length
}).catch((err) => {
console.log(err)
})
},
treeTableNoArrange(tableData) {
this.resultData = tableData.map((item, i) => {
const resData = { ...item.pbo }
resData.parentIndex = i + 1
if (resData.children) {
resData.children.forEach((child, j) => {
child.parentIndex = resData.parentIndex + '.' + (j + 1)
child.state = ''
})
}
if (resData.inventoryJobResponses && resData.inventoryJobResponses.length) {
resData.inventoryJobResponses.forEach(el => {
if (el.subTypeName === 'JobResponseInTest') {
resData.testNo = el.testNo
resData.qualityPeriod = el.qualityPeriod
resData.longPeriod = el.longPeriod
}
if (el.subTypeName === 'JobResponseInEntry') {
resData.targetJobResponseId = el.id
resData.extWorkUnitCode = el.extWorkUnit ? el.extWorkUnit.extcode : ''
}
})
}
return {
...resData,
processInstanceId: item.processTask.processInstanceId,
processTaskId: item.processTask.id
}
})
// this.tableData = tableData
}
}
}
......
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