This commit is contained in:
shijing 2023-10-25 18:29:36 +08:00
parent 1bdd206573
commit d6e15c1917
3 changed files with 26 additions and 13 deletions

View File

@ -22,14 +22,14 @@
</div>
</el-header>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="混料工序" name="first">
<el-tab-pane label="混料工序" name="8车间">
<scTable
ref="table"
:apiObj="apiObj"
:apiObj="apiUtask"
row-key="id"
stripe
:height="topHeight"
:params="query"
:params="paramsUtask8"
>
<el-table-column type="index" width="50"/>
<el-table-column label="任务编号" prop="number">
@ -73,13 +73,14 @@
</el-table-column>
</scTable>
</el-tab-pane>
<el-tab-pane label="成型7车间" name="second">
<el-tab-pane label="成型7车间" name="7车间">
<scTable
ref="table"
:apiObj="apiObj"
:apiObj="apiUtask"
row-key="id"
stripe
:params="query"
:height="topHeight"
:params="paramsUtask7"
>
<el-table-column type="index" width="50"/>
<el-table-column label="任务编号" prop="number">
@ -123,13 +124,14 @@
</el-table-column>
</scTable>
</el-tab-pane>
<el-tab-pane label="成型10车间" name="third">
<el-tab-pane label="成型10车间" name="10车间">
<scTable
ref="table"
:apiObj="apiObj"
:apiObj="apiUtask"
row-key="id"
stripe
:params="query"
:height="topHeight"
:params="paramsUtask10"
>
<el-table-column type="index" width="50"/>
<el-table-column label="任务编号" prop="number">
@ -250,6 +252,10 @@ export default {
dialog: {
save: false,
},
apiUtask: this.$API.pm.utask.list,
paramsUtask7: { parent__isnull: true, mgroup__belong_dept__name: '7车间', material_out__is_hidden: true },
paramsUtask8: { parent__isnull: true, mgroup__belong_dept__name: '8车间', material_out__is_hidden: true },
paramsUtask10: { parent__isnull: true, mgroup__belong_dept__name: '10车间', material_out__is_hidden: true },
apiObj: this.$API.pm.mtask.list,
query: {
page:1,
@ -258,7 +264,7 @@ export default {
},
tableHeight:null,
hideDo:true,
activeName:'first',
activeName:'10车间',
dataList:[
{number:'rwbh2023',name:'玻璃棒',xh:'',count:100,count1:100,start_date:'2023-10-15',end_date:'2023-10-15', count01:100, count02:200, count03:300 },
{number:'rwbh2023',name:'玻璃棒',xh:'',count:100,count1:100,start_date:'2023-10-15',end_date:'2023-10-15', count01:100, count02:250, count03:300 },

View File

@ -35,7 +35,7 @@
:disabled="mode=='edit'"
>
<el-option
v-for="item in processOptions"
v-for="item in options"
:key="item.id"
:label="item.name"
:value="item.id"
@ -116,6 +116,7 @@ export default {
},
visible: false,
isSaveing: false,
options:[],
materialOptions:[],
selectionFilters: [],
setFiltersVisible: false,
@ -125,6 +126,7 @@ export default {
},
mounted() {
this.getMaterial();
this.getMgroup();
},
methods: {
//
@ -133,8 +135,13 @@ export default {
this.visible = true;
return this;
},
getMgroup(){
var res = this.$API.mtm.mgroup.list.req({ page: 0 }).then(res => {
this.options = res;
});
},
getMaterial(){
this.$API.mtm.material.list.req({page:0}).then(res=>{
this.$API.mtm.material.list.req({page:0,type__in:'10,20'}).then(res=>{
this.materialOptions = res;
})
},

View File

@ -9,7 +9,7 @@
<el-button type="primary" @click="handleQuery" >导出</el-button>
</div>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="混料工序" name="混料工序">
<el-tab-pane label="混料工序" name="8车间">
<scTable
ref="table"
:apiObj="apiObj"