|
@@ -24,16 +24,17 @@
|
|
|
<el-input clearable v-model.trim="where.name" placeholder="请输入" />
|
|
<el-input clearable v-model.trim="where.name" placeholder="请输入" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
- <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
|
|
|
|
|
- <el-form-item label="负责人:">
|
|
|
|
|
|
|
+ <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
|
|
|
|
|
+ <el-form-item label="所属工作中心:" prop="extInfo.workCenterId">
|
|
|
<el-select
|
|
<el-select
|
|
|
- v-model.trim="where.leaderId"
|
|
|
|
|
|
|
+ v-model="where.workCenterId"
|
|
|
filterable
|
|
filterable
|
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
|
|
|
+ clearable
|
|
|
>
|
|
>
|
|
|
<el-option
|
|
<el-option
|
|
|
- v-for="item in options.leaderId"
|
|
|
|
|
|
|
+ v-for="item in workCenterList"
|
|
|
:key="item.id"
|
|
:key="item.id"
|
|
|
:label="item.name"
|
|
:label="item.name"
|
|
|
:value="item.id"
|
|
:value="item.id"
|
|
@@ -42,17 +43,36 @@
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
-
|
|
|
|
|
<el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
|
|
<el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
|
|
|
- <el-form-item label="所属工作中心:" prop="extInfo.workCenterId">
|
|
|
|
|
|
|
+ <el-form-item label="工序:" prop="where.sourceTaskId">
|
|
|
<el-select
|
|
<el-select
|
|
|
- v-model="where.workCenterId"
|
|
|
|
|
|
|
+ v-model="where.sourceTaskId"
|
|
|
filterable
|
|
filterable
|
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
|
|
|
+ clearable
|
|
|
>
|
|
>
|
|
|
<el-option
|
|
<el-option
|
|
|
- v-for="item in workCenterList"
|
|
|
|
|
|
|
+ v-for="item in sourceTaskList"
|
|
|
|
|
+ :key="item.id"
|
|
|
|
|
+ :label="item.name"
|
|
|
|
|
+ :value="item.id"
|
|
|
|
|
+ >
|
|
|
|
|
+ </el-option>
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
|
|
|
|
|
+ <el-form-item label="负责人:">
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ v-model.trim="where.leaderId"
|
|
|
|
|
+ filterable
|
|
|
|
|
+ placeholder="请选择"
|
|
|
|
|
+ style="width: 100%"
|
|
|
|
|
+ clearable
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in options.leaderId"
|
|
|
:key="item.id"
|
|
:key="item.id"
|
|
|
:label="item.name"
|
|
:label="item.name"
|
|
|
:value="item.id"
|
|
:value="item.id"
|
|
@@ -88,6 +108,7 @@
|
|
|
import AreaSelect from '@/views/enterpriseModel/regionalManage/components/area-cascader.vue';
|
|
import AreaSelect from '@/views/enterpriseModel/regionalManage/components/area-cascader.vue';
|
|
|
import { basicAreaPageAPI } from '@/api/regionalManage';
|
|
import { basicAreaPageAPI } from '@/api/regionalManage';
|
|
|
import work from '@/api/technology/work';
|
|
import work from '@/api/technology/work';
|
|
|
|
|
+ import producetask from '@/api/technology/production';
|
|
|
export default {
|
|
export default {
|
|
|
components: { AreaSelect },
|
|
components: { AreaSelect },
|
|
|
props: {
|
|
props: {
|
|
@@ -115,7 +136,8 @@
|
|
|
code: '',
|
|
code: '',
|
|
|
name: '',
|
|
name: '',
|
|
|
leaderId: '',
|
|
leaderId: '',
|
|
|
- workCenterId: ''
|
|
|
|
|
|
|
+ workCenterId: '',
|
|
|
|
|
+ sourceTaskId: ''
|
|
|
};
|
|
};
|
|
|
return {
|
|
return {
|
|
|
defaultWhere,
|
|
defaultWhere,
|
|
@@ -126,7 +148,8 @@
|
|
|
leaderId: []
|
|
leaderId: []
|
|
|
},
|
|
},
|
|
|
workCenterList: [],
|
|
workCenterList: [],
|
|
|
- areaTreeList: []
|
|
|
|
|
|
|
+ areaTreeList: [],
|
|
|
|
|
+ sourceTaskList: []
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
computed: {
|
|
computed: {
|
|
@@ -139,6 +162,7 @@
|
|
|
this.getUserPage();
|
|
this.getUserPage();
|
|
|
this.getBasicAreaList();
|
|
this.getBasicAreaList();
|
|
|
this.getListWorkCenter();
|
|
this.getListWorkCenter();
|
|
|
|
|
+ this.getListProduce();
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
/* 获取区域集合 */
|
|
/* 获取区域集合 */
|
|
@@ -160,6 +184,13 @@
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
|
|
+ getListProduce() {
|
|
|
|
|
+ producetask.list({ pageNum: 1, size: -1 }).then((res) => {
|
|
|
|
|
+ console.log(res.list, '工序列表');
|
|
|
|
|
+ this.sourceTaskList = res.list || [];
|
|
|
|
|
+ });
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
/* 搜索 */
|
|
/* 搜索 */
|
|
|
search() {
|
|
search() {
|
|
|
this.$emit('search', this.where);
|
|
this.$emit('search', this.where);
|