|
|
@@ -5,7 +5,8 @@
|
|
|
<!-- 工序名称 -->
|
|
|
<!-- <Search></Search> -->
|
|
|
<div class="content_box_tab">
|
|
|
- <el-tabs v-model="activeName" type="card" stretch>
|
|
|
+ <el-input style="width: 180px" clearable v-model="name" placeholder="请输入筛选项" @input="seekInput" />
|
|
|
+ <el-tabs v-model="activeName" type="card" stretch @tab-click="tabClickValue">
|
|
|
<el-tab-pane label="工序" name="0">
|
|
|
<el-tree :data="produceTaskList" :props="defaultProps" node-key="id" :highlight-current="true"
|
|
|
@node-click="handleNodeClick">
|
|
|
@@ -88,7 +89,7 @@
|
|
|
|
|
|
<div v-if="operationType == 'job'">
|
|
|
<!-- // 报工列表 入库 -->
|
|
|
-
|
|
|
+
|
|
|
<warehousing v-if="taskObj.id == -1" :workListIds="workListIds" ref="wareRef"></warehousing>
|
|
|
|
|
|
<!-- // 设备 入库 -->
|
|
|
@@ -100,9 +101,9 @@
|
|
|
</div>
|
|
|
|
|
|
<!-- 质检工序 -->
|
|
|
-
|
|
|
+
|
|
|
<div v-if="operationType == 'inspection'">
|
|
|
-
|
|
|
+
|
|
|
<inspection :workListIds="workListIds" ref="inspectionRef"></inspection>
|
|
|
</div>
|
|
|
|
|
|
@@ -131,8 +132,8 @@
|
|
|
<picking v-if="pickingShow" @close="pickingClose" :workListIds="workListIds"></picking>
|
|
|
|
|
|
<!-- 工艺文件 -->
|
|
|
- <wokePopup ref="wokePopupRef" ></wokePopup>
|
|
|
-<!-- :workListIds="workListIds" :taskId="taskObj.id" -->
|
|
|
+ <wokePopup ref="wokePopupRef"></wokePopup>
|
|
|
+ <!-- :workListIds="workListIds" :taskId="taskObj.id" -->
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -175,8 +176,9 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ name: '',
|
|
|
activeName: '0',
|
|
|
- taskName:'',
|
|
|
+ taskName: '',
|
|
|
keyWord: '',//搜索
|
|
|
title: '',
|
|
|
type: '',
|
|
|
@@ -185,6 +187,8 @@ export default {
|
|
|
workListIds: [],
|
|
|
factoryworkstationList: [],
|
|
|
title1: '',
|
|
|
+ arr: [],
|
|
|
+ arrTow:[],
|
|
|
produceTaskList: [],
|
|
|
isType: '',
|
|
|
isStep: true,
|
|
|
@@ -227,6 +231,31 @@ export default {
|
|
|
this.workListIds = [];
|
|
|
},
|
|
|
methods: {
|
|
|
+ tabClickValue(){
|
|
|
+ this.name ='';
|
|
|
+ this.seekInput()
|
|
|
+
|
|
|
+ },
|
|
|
+ // 前端筛选
|
|
|
+ seekInput() {
|
|
|
+ // console.log(activeName);
|
|
|
+
|
|
|
+ if (this.activeName == '0') {
|
|
|
+ if (!this.name) return (this.produceTaskList = this.arr);
|
|
|
+ this.produceTaskList = this.produceTaskList.filter(item => {
|
|
|
+ return item.name.indexOf(this.name) > -1
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ if (!this.name) return (this.factoryworkstationList = this.arrTow);
|
|
|
+ this.factoryworkstationList = this.factoryworkstationList.filter(item => {
|
|
|
+ return item.name.indexOf(this.name) > -1
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
// 折叠悬浮中样式调整
|
|
|
init() {
|
|
|
this.$store.dispatch('theme/setCollapse', true);
|
|
|
@@ -237,16 +266,16 @@ export default {
|
|
|
taskId: this.taskObj.id,
|
|
|
workOrderIds: value.map(item => item.id)
|
|
|
})
|
|
|
- this.title1=res.data.map(item=>item.taskTypeName).toString()
|
|
|
+ this.title1 = res.data.map(item => item.taskTypeName).toString()
|
|
|
} else {
|
|
|
this.title1 = ''
|
|
|
}
|
|
|
|
|
|
},
|
|
|
handleSearch() {
|
|
|
- let obj={
|
|
|
- keyWord:this.keyWord,
|
|
|
- taskName:this.taskName
|
|
|
+ let obj = {
|
|
|
+ keyWord: this.keyWord,
|
|
|
+ taskName: this.taskName
|
|
|
}
|
|
|
this.$refs.produceOrder.handleSearch(obj);
|
|
|
//handleSearch(this.code);
|
|
|
@@ -294,6 +323,7 @@ export default {
|
|
|
v.newName = `${v.workCenterName}-${v.name}`
|
|
|
})
|
|
|
this.produceTaskList = res;
|
|
|
+ this.arr = JSON.parse(JSON.stringify(this.produceTaskList));
|
|
|
// newName
|
|
|
});
|
|
|
},
|
|
|
@@ -305,7 +335,9 @@ export default {
|
|
|
console.log(res, 'res');
|
|
|
this.factoryworkstationList = res.list;
|
|
|
|
|
|
+ this.arrTow = JSON.parse(JSON.stringify(this.factoryworkstationList));
|
|
|
|
|
|
+
|
|
|
// newName
|
|
|
});
|
|
|
},
|
|
|
@@ -343,7 +375,7 @@ export default {
|
|
|
this.workListIds = data.ids;
|
|
|
},
|
|
|
|
|
|
- pickingWokeClose(){
|
|
|
+ pickingWokeClose() {
|
|
|
this.wokePopup = false;
|
|
|
},
|
|
|
|
|
|
@@ -375,14 +407,14 @@ export default {
|
|
|
// 工艺路线
|
|
|
if (t === 'work') {
|
|
|
|
|
|
- let req ={
|
|
|
+ let req = {
|
|
|
taskId: this.taskObj.id,
|
|
|
workOrderId: this.workListIds[0]
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
this.$refs.wokePopupRef.open(req);
|
|
|
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
if (t == 'feed') {
|
|
|
}
|