Yangwl
/
LJ-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
yangwl
wws 1 year ago
parent 69a63d546f 2c573b97cc
commit 5b6d692dd8
3 changed files with 113 additions and 90 deletions
Show Stats Download Patch File Download Diff File

33
src/views/wms/shifts/index.vue
Unescape Escape View File

@ -72,24 +72,24 @@
<el-table v-loading="loading" :data="shiftsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- 序号 -->
<el-table-column
type="index"
width="90"
align="center"
:index="indexMethod"
label="序号">
</el-table-column>
<el-table-column
type="index"
width="90"
align="center"
:index="indexMethod"
label="序号">
</el-table-column>
<el-table-column label="班次编码" align="center" prop="shiftCode" />
<el-table-column label="班次名称" align="center" prop="shiftDescGlobal" />
<el-table-column label="开始时间" align="center" prop="shiftStartTime" />
<el-table-column label="结束时间" align="center" prop="shiftEndTime" />
<el-table-column label="结束时间" align="center" prop="shiftEndTime" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createDate"/>
<el-table-column prop="active" label="是否启用" align="center">
<template slot-scope="scope">
{{ scope.row.active == 1 ? "是" : "否" }}
</template>
</el-table-column>
<template slot-scope="scope">
{{ scope.row.active == 1 ? "是" : "否" }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -121,14 +121,6 @@
<!-- 添加或修改班次管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<!-- 序号 -->
<el-table-column
type="index"
width="90"
align="center"
:index="indexMethod"
label="序号">
</el-table-column>
<el-form-item label="班次编码" prop="shiftCode">
<el-input v-model="form.shiftCode" placeholder="请输入班次编码" />
</el-form-item>
@ -227,7 +219,6 @@ export default {
form: {},
// 表单校验
rules: {
}
};
},

2
src/views/wms/supplier/index.vue
Unescape Escape View File

@ -251,7 +251,7 @@
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-col :span="12">
<el-form-item label="供应商代码" prop="supplierCode">
<el-input v-model="form.supplierCode" placeholder="请输入供应商代码" />
</el-form-item>

168
src/views/wms/team/index.vue
Unescape Escape View File

@ -72,28 +72,28 @@
<el-table v-loading="loading" :data="teamList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- 序号 -->
<el-table-column
type="index"
width="90"
align="center"
:index="indexMethod"
label="序号">
</el-table-column>
<el-table-column
type="index"
width="90"
align="center"
:index="indexMethod"
label="序号">
</el-table-column>
<el-table-column label="班组编码" align="center" prop="teamCode" />
<el-table-column label="班组名称" align="center" prop="teamDescGlobal" />
<el-table-column prop="teamType" label="班组类别" align="center" >
<template slot-scope="scope">
{{ scope.row.teamType == "team_type1" ? "生产班组" : "检验班组" }}
</template>
</el-table-column>
<template slot-scope="scope">
{{ scope.row.teamType == "team_type1" ? "生产班组" : "检验班组" }}
</template>
</el-table-column>
<el-table-column label="所属产线" align="center" prop="productionLineCode" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createDate" />
<el-table-column prop="active" label="是否启用" align="center">
<template slot-scope="scope">
{{ scope.row.active == 1 ? "是" : "否" }}
</template>
</el-table-column>
<template slot-scope="scope">
{{ scope.row.active == 1 ? "是" : "否" }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -123,61 +123,89 @@
/>
<!-- 添加或修改班组对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="班组编码" prop="teamCode">
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="班组编码" prop="teamCode">
<el-input v-model="form.teamCode" placeholder="请输入班组编码" />
</el-form-item>
<el-form-item label="班组简称" prop="teamDesc">
<el-input v-model="form.teamDesc" placeholder="请输入班组简称" />
</el-form-item>
<el-form-item label="班组名称" prop="teamDescGlobal">
</el-col>
<el-col :span="12">
<el-form-item label="班组名称" prop="teamDescGlobal">
<el-input v-model="form.teamDescGlobal" placeholder="请输入班组通用名称" />
</el-form-item>
</el-form-item>
<el-form-item label="班组类型" prop="teamType">
<el-select v-model="form.teamType" placeholder="请选择班组">
<el-option
v-for="dict in dict.type.team_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="班组扩展名称" prop="teamDescExtended">
<el-input v-model="form.teamDescExtended" placeholder="请输入班组扩展名称" />
</el-form-item>
<el-form-item label="是否启用" prop="active">
<el-input v-model="form.active" placeholder="请输入是否启用" />
</el-form-item>
<el-form-item label="企业编码" prop="enterpriseCode">
<el-input v-model="form.enterpriseCode" placeholder="请输入企业编码" />
</el-form-item>
<el-form-item label="工厂编码" prop="siteCode">
<el-input v-model="form.siteCode" placeholder="请输入工厂编码" />
</el-form-item>
<el-form-item label="所属产线" prop="productionLineCode">
<el-input v-model="form.productionLineCode" placeholder="请输入线体编码" />
</el-form-item>
<el-form-item label="班组长编码" prop="teamLeaderCode">
<el-input v-model="form.teamLeaderCode" placeholder="请输入班组长编码" />
</el-form-item>
<el-form-item label="定编岗位数量" prop="planPostQuantity">
<el-input v-model="form.planPostQuantity" placeholder="请输入定编岗位数量" />
</el-form-item>
<el-form-item label="已分配岗位数量" prop="actualPostQuantity">
<el-input v-model="form.actualPostQuantity" placeholder="请输入已分配岗位数量" />
</el-form-item>
<el-form-item label="班组属性" prop="teamProperties">
<el-input v-model="form.teamProperties" placeholder="请输入班组属性" />
</el-form-item>
<el-form-item label="应出勤人数" prop="attendanceQuantity">
<el-input v-model="form.attendanceQuantity" placeholder="请输入应出勤人数" />
</el-form-item>
<el-form-item label="已分配人数" prop="assignedQuantity">
<el-input v-model="form.assignedQuantity" placeholder="请输入已分配人数" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="班组类型" prop="teamType">
<el-select v-model="form.teamType" placeholder="请选择班组">
<el-option
v-for="dict in dict.type.team_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否启用" prop="active">
<el-select v-model="form.active" placeholder="请选择是否启用" @change="$forceUpdate()" clearable>
<el-option v-for="item in options" :key="item.active" :label="item.label" :value="item.active"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="工厂编码" prop="siteCode">
<el-input v-model="form.siteCode" placeholder="请输入工厂编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属产线" prop="productionLineCode">
<el-input v-model="form.productionLineCode" placeholder="请输入线体编码" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="班组长编码" prop="teamLeaderCode">
<el-input v-model="form.teamLeaderCode" placeholder="请输入班组长编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="定编岗位数量" prop="planPostQuantity">
<el-input v-model="form.planPostQuantity" placeholder="请输入定编岗位数量" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="已分配岗位数量" prop="actualPostQuantity">
<el-input v-model="form.actualPostQuantity" placeholder="请输入已分配岗位数量" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="班组属性" prop="teamProperties">
<el-input v-model="form.teamProperties" placeholder="请输入班组属性" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="12">
<el-form-item label="应出勤人数" prop="attendanceQuantity">
<el-input v-model="form.attendanceQuantity" placeholder="请输入应出勤人数" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="已分配人数" prop="assignedQuantity">
<el-input v-model="form.assignedQuantity" placeholder="请输入已分配人数" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -240,6 +268,13 @@ export default {
attendanceQuantity: null,
assignedQuantity: null
},
options: [{
active: "1",
label: '是'
}, {
active: "0",
label: '否'
}],
// 表单参数
form: {},
// 表单校验
@ -250,9 +285,6 @@ export default {
teamDescGlobal: [
{ required: true, message: "班组名称不能为空", trigger: "blur" }
],
productionLineCode: [
{ required: true, message: "所属产线不能为空", trigger: "blur" }
],
active: [
{ required: true, message: "是否启用不能为空", trigger: "blur" }
],

Write Preview
Loading…
Cancel
Save