问题修改

dev-scheduling
zhangdi 2 weeks ago
parent 8de4780b29
commit dda917177d
  1. 43
      src/views/basicData/teamManagement.vue
  2. 2
      src/views/inboundOutboundManagement/binTransfer/components/addEditDialog.vue
  3. 4
      src/views/inboundOutboundManagement/glassCakeOutbound/components/addDialog.vue
  4. 10
      src/views/productionSchedulingPlan/basic/nonSameFurnace.vue
  5. 2
      src/views/productionSchedulingPlan/basic/oemProcess.vue

@ -16,7 +16,6 @@
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
:before-open="beforeOpen"
@on-load="onLoad"
@sort-change="sortChange"
:permission="permissionList"
@ -384,7 +383,7 @@ export default {
label: '班组长',
prop: 'teamLeader',
search: false,
type: 'select',
// type: 'select',
sortable: 'custom',
filter: true,
span: 12,
@ -396,12 +395,12 @@ export default {
trigger: 'blur',
},
],
dicUrl: '/api/blade-system/user/page?current=1&size=9999',
props: {
label: 'realName',
value: 'id',
res: 'data.records',
},
// dicUrl: '/api/blade-system/user/page?current=1&size=9999',
// props: {
// label: 'realName',
// value: 'id',
// res: 'data.records',
// },
},
{
label: '计划员',
@ -409,7 +408,7 @@ export default {
search: false,
sortable: 'custom',
filter: true,
type: 'select',
// type: 'select',
span: 12,
width: 100,
rules: [
@ -419,12 +418,12 @@ export default {
trigger: 'blur',
},
],
dicUrl: '/api/blade-system/user/page?current=1&size=9999',
props: {
label: 'realName',
value: 'id',
res: 'data.records',
},
// dicUrl: '/api/blade-system/user/page?current=1&size=9999',
// props: {
// label: 'realName',
// value: 'id',
// res: 'data.records',
// },
},
{
label: '调度员',
@ -433,7 +432,7 @@ export default {
sortable: 'custom',
filter: true,
remote: true,
type: 'select',
// type: 'select',
span: 12,
width: 100,
rules: [
@ -443,12 +442,12 @@ export default {
trigger: 'blur',
},
],
dicUrl: '/api/blade-system/user/page?current=1&size=9999&realName={{key}}',
props: {
label: 'realName',
value: 'id',
res: 'data.records',
},
// dicUrl: '/api/blade-system/user/page?current=1&size=9999&realName={{key}}',
// props: {
// label: 'realName',
// value: 'id',
// res: 'data.records',
// },
},
{
label: '班组人员',

@ -1,5 +1,5 @@
<template>
<el-dialog :title="title" append-to-body :modelValue="openShow" width="70%" @close="closeDialog">
<el-dialog :title="title" append-to-body :modelValue="openShow" width="90%" @close="closeDialog">
<div style="margin-bottom: 12px" v-if="title == '新增'">
<el-button type="primary" @click="addTable">插入一行</el-button>
<el-button type="danger" @click="delTable">删除选中行</el-button>

@ -113,8 +113,8 @@ export default {
column: [
{
label: '车间订单号',
prop: 'woCode',
label: '生产单号',
prop: 'yoCode',
width: 150,
search: false,
},

@ -133,6 +133,8 @@ export default {
span: 12,
type: 'select',
filterable: true,
hide:true,
width:150,
dicUrl: '/blade-scheduling/processSet/findList',
props: {
label: 'name',
@ -155,8 +157,8 @@ export default {
search: false,
sortable: 'custom',
span: 12,
hide:true,
display:false,
width:150,
},
{
label: '工艺能力',
@ -167,6 +169,7 @@ export default {
width:120,
type: 'select',
filterable: true,
hide:true,
dicUrl: '/blade-scheduling/craftAbility/findList',
props: {
label: 'caName',
@ -189,8 +192,9 @@ export default {
search: false,
sortable: 'custom',
span: 12,
hide:true,
display:false
// hide:true,
display:false,
width: 120,
},
{
label: '影响因素',

@ -195,7 +195,7 @@ export default {
return false
}
const item = val.dic.find(dic => dic.id === val.value);
this.form.processName = selectedNames.name
this.form.processName = item.name
// // id
// const selectedNames = val.value.map(id => {
// const item = val.dic.find(dic => dic.id === id);

Loading…
Cancel
Save