标准入库流程bug
This commit is contained in:
@@ -1456,6 +1456,7 @@ export default {
|
|||||||
callback()
|
callback()
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
|
gdType: '', //归档位置的赋值
|
||||||
standTypeModel: 'INLAND',
|
standTypeModel: 'INLAND',
|
||||||
submitType: '',
|
submitType: '',
|
||||||
nodeList3: [],
|
nodeList3: [],
|
||||||
@@ -2223,6 +2224,7 @@ export default {
|
|||||||
switch (status) {
|
switch (status) {
|
||||||
// 新增
|
// 新增
|
||||||
case 1:
|
case 1:
|
||||||
|
this.gdType = '新增'
|
||||||
this.selectedList = []
|
this.selectedList = []
|
||||||
this.standardCheckedList = []
|
this.standardCheckedList = []
|
||||||
this.standardDrawer = false
|
this.standardDrawer = false
|
||||||
@@ -2231,6 +2233,7 @@ export default {
|
|||||||
break
|
break
|
||||||
// 带入(确认)
|
// 带入(确认)
|
||||||
case 2:
|
case 2:
|
||||||
|
this.gdType = '带入'
|
||||||
if (this.standardCheckedList.length === 1) {
|
if (this.standardCheckedList.length === 1) {
|
||||||
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
|
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
|
||||||
_this: this
|
_this: this
|
||||||
@@ -2368,7 +2371,7 @@ export default {
|
|||||||
}, {}, res => {
|
}, {}, res => {
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
this.treeListOptions = res.data
|
this.treeListOptions = res.data
|
||||||
if(bringData.standNumber){
|
if(this.gdType === '带入'){
|
||||||
this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', {
|
this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', {
|
||||||
standId: bringData.id,
|
standId: bringData.id,
|
||||||
}, {}, reson => {
|
}, {}, reson => {
|
||||||
@@ -2388,6 +2391,20 @@ export default {
|
|||||||
this.form.treeListId = treeListId
|
this.form.treeListId = treeListId
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
}else{
|
||||||
|
let treeList = ''
|
||||||
|
let treeListId = ''
|
||||||
|
reson.data.forEach(item=>{
|
||||||
|
this.treeCheckedKeys.push(item.menuId)
|
||||||
|
if (treeList.length > 0) {
|
||||||
|
treeList += ','
|
||||||
|
treeListId += ','
|
||||||
|
}
|
||||||
|
treeList += item.menuName
|
||||||
|
treeListId += item.menuId
|
||||||
|
})
|
||||||
|
this.form.treeListName = treeList
|
||||||
|
this.form.treeListId = treeListId
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
|
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
|
||||||
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>-->
|
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>-->
|
||||||
</div>
|
</div>
|
||||||
<div class="content" v-if="active === '1'">
|
<div class="content" v-show="active === '1'">
|
||||||
<div style="flex: auto; overflow: auto;">
|
<div style="flex: auto; overflow: auto;">
|
||||||
<el-form
|
<el-form
|
||||||
ref="form"
|
ref="form"
|
||||||
@@ -1260,7 +1260,7 @@
|
|||||||
</el-collapse>
|
</el-collapse>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="content" v-if="active === '2'">
|
<div class="content" v-show="active === '2'">
|
||||||
<div class="block" style="padding-top: 20px;">
|
<div class="block" style="padding-top: 20px;">
|
||||||
<el-timeline>
|
<el-timeline>
|
||||||
<el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
|
<el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
|
||||||
@@ -1307,7 +1307,7 @@
|
|||||||
</el-timeline>
|
</el-timeline>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="content" v-if="active === '3'">
|
<div class="content" v-show="active === '3'">
|
||||||
<div class="flow-list">
|
<div class="flow-list">
|
||||||
<el-table
|
<el-table
|
||||||
height="100%"
|
height="100%"
|
||||||
|
|||||||
Reference in New Issue
Block a user