leo
/
LAPP_GAAS_GFrame_WEBFRONT
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

添加字段

langfang_wms
liwei 3 years ago
parent
c561211451
commit
4e46033f0c
2 changed files with 262 additions and 111 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +225
    -102
      src/views/plant/resource/station.vue
  2. +37
    -9
      src/views/productexe/basic/person.vue

+ 225
- 102
src/views/plant/resource/station.vue View File

@ -7,24 +7,52 @@
placeholder="请输入查询内容"
clearable
size="small"
style="width: 200px"/>
style="width: 200px"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button
size="mini"
type="primary"
icon="el-icon-plus"
@click="handleAdd"
>新增</el-button>
>新增</el-button
>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="dataList" border>
<el-table-column v-for="(item, index) in headers" :key="index" :label="getColumnName(item)" :show-overflow-tooltip="true" width="156px">
<el-table-column
v-for="(item, index) in headers"
:key="index"
:label="getColumnName(item)"
:show-overflow-tooltip="true"
width="156px"
>
<template slot-scope="scope">
<span v-if="item === 'WorkPlace-PlantNr'">{{ getValue(scope.row['WorkPlace-PlantNr']) }}</span>
<span v-else-if="item === 'WorkPlace-LastModify'"> {{ parseTime(scope.row[item]) }} </span>
<span v-else-if="item === 'WorkPlace-CreateTime'"> {{ parseTime(scope.row[item]) }} </span>
<span v-if="item === 'WorkPlace-PlantNr'">{{
getValue(scope.row['WorkPlace-PlantNr'])
}}</span>
<span v-else-if="item === 'WorkPlace-LastModify'">
{{ parseTime(scope.row[item]) }}
</span>
<span v-else-if="item === 'WorkPlace-CreateTime'">
{{ parseTime(scope.row[item]) }}
</span>
<span v-else-if="item === 'WorkPlace-RequireSkillRank1'">
{{ setBez(scope.row[item], 'requireSkillRank1List') }}
</span>
<span v-else-if="item === 'WorkPlace-TriggerFrom'">
{{ setBez(scope.row[item], 'triggerFromList') }}
</span>
<span v-else>{{ scope.row[item] }}</span>
</template>
</el-table-column>
@ -35,115 +63,186 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button>
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNumber"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<el-dialog :title="title" :visible.sync="open" width="800px" :close-on-click-modal="false">
<el-dialog
:title="title"
:visible.sync="open"
width="800px"
:close-on-click-modal="false"
>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-WorkPlaceId')" prop="WorkPlace-WorkPlaceId">
<el-input v-model="form['WorkPlace-WorkPlaceId']" :disabled="!isAdd" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-Descr')">
<el-input v-model="form['WorkPlace-Descr']" placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-WorkPlaceGrpNr')">
<el-input v-model="form['WorkPlace-WorkPlaceGrpNr']" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-WorkPlaceType')">
<el-select v-model="form['WorkPlace-WorkPlaceType']" placeholder="请选择">
<el-option
v-for="item in workPlaceType"
:key="item['stdeftab-bez']"
:label="item['stdeftab-bez']"
:value="item['stdeftab-bez']"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<!-- 成本中心ID -->
<el-form-item :label="getColumnName('WorkPlace-CostCenterId')" prop="WorkPlace-CostCenterId">
<el-select v-model="form['WorkPlace-CostCenterId']" filterable placeholder="请选择">
<el-option
v-for="(item, index) in costCenterArray"
:key="index"
:label="item['CostCenter-Descr']"
:value="item['CostCenter-PlantNr']"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-WeekModelNr')">
<el-select v-model="form['WorkPlace-WeekModelNr']" filterable placeholder="请选择">
<el-option
v-for="item in weekModelArray"
:key="item['WeekModel-WeekModelNr']"
:label="item['WeekModel-Descr']"
:value="item['WeekModel-WeekModelNr']"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-WorkCalendarNr')">
<el-select v-model="form['WorkPlace-WorkCalendarNr']" filterable placeholder="请选择">
<el-option
v-for="item in workcalendarArray"
:key="item['WorkCalendar-WorkCalendarNr']"
:label="item['WorkCalendar-Descr']"
:value="item['WorkCalendar-WorkCalendarNr']"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-PlanEfficiency')">
<el-input v-model="form['WorkPlace-PlanEfficiency']" placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-CostRate')">
<el-input v-model="form['WorkPlace-CostRate']" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-LocationId')">
<el-input v-model="form['WorkPlace-LocationId']" placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item
:label="getColumnName('WorkPlace-WorkPlaceId')"
prop="WorkPlace-WorkPlaceId"
>
<el-input
v-model="form['WorkPlace-WorkPlaceId']"
:disabled="!isAdd"
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-Descr')">
<el-input
v-model="form['WorkPlace-Descr']"
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-RequireSkillRank1')" prop="WorkPlace-RequireSkillRank1">
<el-select
v-model="form['WorkPlace-RequireSkillRank1']"
filterable
placeholder="请选择"
>
<el-option
v-for="item in requireSkillRank1List"
:key="item['stdeftab-stdeftyp']"
:label="item['stdeftab-bez']"
:value="item['stdeftab-stdeftyp']"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-TriggerFrom')" prop="WorkPlace-TriggerFrom">
<el-select
v-model="form['WorkPlace-TriggerFrom']"
filterable
placeholder="请选择"
>
<el-option
v-for="item in triggerFromList"
:key="item['stdeftab-stdeftyp']"
:label="item['stdeftab-bez']"
:value="item['stdeftab-stdeftyp']"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-WorkPlaceGrpNr')">
<el-input
v-model="form['WorkPlace-WorkPlaceGrpNr']"
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-WorkPlaceType')">
<el-select
v-model="form['WorkPlace-WorkPlaceType']"
placeholder="请选择"
>
<el-option
v-for="item in workPlaceType"
:key="item['stdeftab-bez']"
:label="item['stdeftab-bez']"
:value="item['stdeftab-bez']"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 成本中心ID -->
<el-form-item
:label="getColumnName('WorkPlace-CostCenterId')"
prop="WorkPlace-CostCenterId"
>
<el-select
v-model="form['WorkPlace-CostCenterId']"
filterable
placeholder="请选择"
>
<el-option
v-for="(item, index) in costCenterArray"
:key="index"
:label="item['CostCenter-Descr']"
:value="item['CostCenter-PlantNr']"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-WeekModelNr')">
<el-select
v-model="form['WorkPlace-WeekModelNr']"
filterable
placeholder="请选择"
>
<el-option
v-for="item in weekModelArray"
:key="item['WeekModel-WeekModelNr']"
:label="item['WeekModel-Descr']"
:value="item['WeekModel-WeekModelNr']"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-WorkCalendarNr')">
<el-select
v-model="form['WorkPlace-WorkCalendarNr']"
filterable
placeholder="请选择"
>
<el-option
v-for="item in workcalendarArray"
:key="item['WorkCalendar-WorkCalendarNr']"
:label="item['WorkCalendar-Descr']"
:value="item['WorkCalendar-WorkCalendarNr']"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-PlanEfficiency')">
<el-input
v-model="form['WorkPlace-PlanEfficiency']"
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-CostRate')">
<el-input
v-model="form['WorkPlace-CostRate']"
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('WorkPlace-LocationId')">
<el-input
v-model="form['WorkPlace-LocationId']"
placeholder="请输入"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -201,7 +300,15 @@ export default {
'WorkPlace-WorkPlaceId': [
{ required: true, message: '此项不能为空', trigger: 'blur' }
],
}
'WorkPlace-RequireSkillRank1':[
{ required: true, message: '此项不能为空', trigger: 'blur' }
],
'WorkPlace-TriggerFrom':[
{ required: true, message: '此项不能为空', trigger: 'blur' }
]
},
triggerFromList:[],
requireSkillRank1List:[]
}
},
created() {
@ -223,8 +330,23 @@ export default {
getCostcenterList().then(res => {
this.costCenterArray = res.data
})
// 获取 标准定义
this.getStanderOne({ statid: 'WorkPlace-RequireSkillRank1' }).then(({data=[]}) => {
this.requireSkillRank1List=data.map(e=>{
e['stdeftab-stdeftyp']=Number(e['stdeftab-stdeftyp']);
return e;
});
})
// 获取 标准定义
this.getStanderOne({ statid: 'WorkPlace-TriggerFrom' }).then(({data=[]}) => {
this.triggerFromList=data;
})
},
methods: {
setBez(value, data){
const item = this[data].find(e=>e['stdeftab-stdeftyp'] == value);
return item ? item['stdeftab-bez'] : value;
},
/** 查询列表 */
getList() {
this.loading = true
@ -235,6 +357,8 @@ export default {
this.headers = [
'WorkPlace-PlantNr',
'WorkPlace-WorkPlaceNr',
'WorkPlace-RequireSkillRank1',
'WorkPlace-TriggerFrom',
'WorkPlace-WorkPlaceId',
'WorkPlace-Descr',
'WorkPlace-WorkPlaceGrpNr',
@ -362,5 +486,4 @@ export default {
</script>
<style lang="scss" scoped>
</style>

+ 37
- 9
src/views/productexe/basic/person.vue View File

@ -25,6 +25,7 @@
<span v-if="item === 'Person-PlantNr'">{{ getValue(scope.row['Person-PlantNr']) }}</span>
<span v-else-if="item === 'Person-LastModify'"> {{ parseTime(scope.row[item]) }} </span>
<span v-else-if="item === 'Person-CreateTime'"> {{ parseTime(scope.row[item]) }} </span>
<span v-else-if="item === 'Person-PersonIPara1'"> {{ setBez(scope.row[item]) }} </span>
<span v-else>{{ scope.row[item] }}</span>
</template>
</el-table-column>
@ -111,6 +112,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('Person-PersonIPara1')" prop="Person-PersonIPara1">
<el-select v-model="form['Person-PersonIPara1']" filterable placeholder="请选择">
<el-option
v-for="item in personPersonIPara1List"
:key="item['stdeftab-stdeftyp']"
:label="item['stdeftab-bez']"
:value="item['stdeftab-stdeftyp']"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="getColumnName('Person-DepartmentId')">
<el-input v-model="form['Person-DepartmentId']" placeholder="请输入" />
@ -127,14 +140,14 @@
</el-form-item>
</el-col>
</el-tab-pane>
<el-tab-pane label="工位分配" name="second">
<!-- <el-tab-pane label="工位分配" name="second">
<el-col>
<div class="users-wrap">
<el-transfer v-model="groupValue" :data="groupData" :titles="['未分配工位', '已分配工位']"
:props="{key: 'WorkPlace-WorkPlaceNr', label: 'WorkPlace-Descr'}"></el-transfer>
</div>
</el-col>
</el-tab-pane>
</el-tab-pane> -->
</el-tabs>
</el-col>
</el-row>
@ -199,11 +212,22 @@ export default {
],
'Person-BirthDate': [
{ required: true, message: '此项不能为空', trigger: 'blur' }
],
'Person-PersonIPara1':[
{ required: true, message: '此项不能为空', trigger: 'blur' }
]
}
},
personPersonIPara1List:[]
}
},
created() {
// 获取 标准定义
this.getStanderOne({ statid: 'Person-PersonIPara1' }).then(({data=[]}) => {
this.personPersonIPara1List=data.map(e=>{
e['stdeftab-stdeftyp']=Number(e['stdeftab-stdeftyp']);
return e;
});
})
this.options = getWorkshopList()
this.getList()
// 获取成本中心数据
@ -213,6 +237,10 @@ export default {
this.getAttrList()
},
methods: {
setBez(value){
const item = this.personPersonIPara1List.find(e=>e['stdeftab-stdeftyp'] == value);
return item ? item['stdeftab-bez'] : value;
},
getAttrList() {
getWorkplaceList().then(
response => {
@ -249,9 +277,9 @@ export default {
'Person-EntryDate',
'Person-BirthDate',
'Person-PersonIPara1',
'Person-PersonIPara2',
'Person-PersonDPara1',
'Person-PersonDPara2',
// 'Person-PersonIPara2',
// 'Person-PersonDPara1',
// 'Person-PersonDPara2',
'Person-Avatar',
'Person-LastModify',
'Person-LastUser',
@ -288,9 +316,9 @@ export default {
'Person-EntryDate': undefined,
'Person-BirthDate': undefined,
'Person-PersonIPara1': undefined,
'Person-PersonIPara2': undefined,
'Person-PersonDPara1': undefined,
'Person-PersonDPara2': undefined,
// 'Person-PersonIPara2': undefined,
// 'Person-PersonDPara1': undefined,
// 'Person-PersonDPara2': undefined,
'Person-Avatar': undefined,
'Person-LastModify': undefined,
'Person-LastUser': undefined,


Write Preview
Loading…
Cancel
Save