UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

8/29 工位业务类型修改

Browse Source
20240912_adapter_z
wangwei 1 year ago
parent 60083984f9
commit d0430fedd7
2 changed files with 73 additions and 49 deletions
Show Stats Download Patch File Download Diff File

37
src/views/basic/workplace/addBusTypeDialog.vue
Unescape Escape View File

@ -55,11 +55,11 @@
</el-row> </el-row>
<el-row :gutter="24" class="el-row"> <el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="出入库方式:" prop="documentTypeCode" class="query-form-item"> <el-form-item label="管理设备:" prop="documentTypeCode" class="query-form-item">
<el-select v-model="formData.inoutType" style="width: 80%" placeholder="选择出入库方式" <el-select v-model="formData.inoutType" style="width: 80%" placeholder="请选择是否管理设备"
> >
<el-option label="入库" :value="1"></el-option> <el-option label="是" :value="1"></el-option>
<el-option label="出库" :value="2"></el-option> <el-option label="否" :value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -74,6 +74,16 @@
</el-row> </el-row>
<el-row :gutter="24" class="el-row"> <el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="作业类型:" prop="workplaceType" class="query-form-item">
<el-select v-model="formData.workplaceType" style="width: 80%" placeholder="作业类型">
<el-option label="全部" :value="3"></el-option>
<el-option label="拆零" :value="1"></el-option>
<el-option label="取整" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="扫码方式:" prop="scanType" class="query-form-item"> <el-form-item label="扫码方式:" prop="scanType" class="query-form-item">
<el-select v-model="formData.scanType" style="width: 80%" placeholder="选择扫码方式" <el-select v-model="formData.scanType" style="width: 80%" placeholder="选择扫码方式"
@ -85,6 +95,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="结果处理:" prop="checkInsert" class="query-form-item"> <el-form-item label="结果处理:" prop="checkInsert" class="query-form-item">
<el-select v-model="formData.checkInsert" style="width: 80%" placeholder="选择扫码方式" <el-select v-model="formData.checkInsert" style="width: 80%" placeholder="选择扫码方式"
@ -96,9 +110,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="异常提醒方式:" prop="warnType" class="query-form-item"> <el-form-item label="异常提醒方式:" prop="warnType" class="query-form-item">
<el-select v-model="formData.warnType" style="width: 80%" placeholder="选择扫码方式"> <el-select v-model="formData.warnType" style="width: 80%" placeholder="选择扫码方式">
@ -108,6 +119,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="默认仓库:" prop="invCode" class="query-form-item"> <el-form-item label="默认仓库:" prop="invCode" class="query-form-item">
<el-select v-model="formData.invCode" placeholder="请选择仓库" <el-select v-model="formData.invCode" placeholder="请选择仓库"
@ -125,9 +139,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="往来单位类型:" prop="corpType" class="query-form-item"> <el-form-item label="往来单位类型:" prop="corpType" class="query-form-item">
<el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型" <el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型"
@ -142,7 +153,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="往来类型标题:" prop="unitTittle" class="query-form-item"> <el-form-item label="往来类型标题:" prop="unitTittle" class="query-form-item">
<el-input <el-input
@ -238,6 +251,7 @@ export default {
documentTypeCode: null, documentTypeCode: null,
orderCirType: 1, orderCirType: 1,
warnType: 2, warnType: 2,
workplaceType:3
}, },
invList: [], invList: [],
busTypes: [], busTypes: [],
@ -263,6 +277,9 @@ export default {
orderCirType: [ orderCirType: [
{required: true, message: '请选择单据流通方式', trigger: 'blur'} {required: true, message: '请选择单据流通方式', trigger: 'blur'}
], ],
workplaceType: [
{ required: true, message: '请选择作业类型', trigger: 'blur' }
]
// corpType: [ // corpType: [
// // { required: true, message: '请选择往来单位类型', trigger: 'blur' } // // { required: true, message: '请选择往来单位类型', trigger: 'blur' }
// ], // ],

85
src/views/basic/workplace/workplaceManage.vue
Unescape Escape View File

@ -108,11 +108,11 @@
<el-table-column type="index" label="序号"></el-table-column> <el-table-column type="index" label="序号"></el-table-column>
<el-table-column label="工位编码" prop="workplaceId" width="90"></el-table-column> <el-table-column label="工位编码" prop="workplaceId" width="90"></el-table-column>
<el-table-column label="工位名称" prop="workplaceName" width="120"></el-table-column> <el-table-column label="工位名称" prop="workplaceName" width="120"></el-table-column>
<el-table-column label="工位类型" prop="workplaceType" width="90"> <!--<el-table-column label="工位类型" prop="workplaceType" width="90">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ workplaceTypeMao[scope.row.workplaceType] }}</span> <!-- <span>{{ workplaceTypeMao[scope.row.workplaceType] }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!--</el-table-column>-->
<!-- <el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>--> <!-- <el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>-->
<el-table-column label="工位状态" prop="workplaceStatus" width="90"> <el-table-column label="工位状态" prop="workplaceStatus" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
@ -210,7 +210,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="thrBusName" width="140"></el-table-column> <el-table-column label="单据类型" prop="thrBusName" width="140"></el-table-column>
<el-table-column label="出入库方式" prop="inoutType" width="100"> <el-table-column label="工位类型" prop="workplaceType" width="90">
<template slot-scope="scope">
<span>{{ workplaceTypeMap[scope.row.workplaceType] }}</span>
</template>
</el-table-column>
<el-table-column label="管理设备" prop="inoutType" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ inoutTypes[scope.row.inoutType] }}</span> <span>{{ inoutTypes[scope.row.inoutType] }}</span>
</template> </template>
@ -369,18 +374,16 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col"> <!--<el-col :span="12" class="el-col">-->
<el-form-item label="工位类型:" prop="workplaceType" class="query-form-item"> <!-- <el-form-item label="工位类型:" prop="workplaceType" class="query-form-item">-->
<el-select v-model="formData.workplaceType" style="width: 80%" placeholder="工位类型"> <!-- <el-select v-model="formData.workplaceType" style="width: 80%" placeholder="工位类型">-->
<el-option label="全部" :value="3"></el-option> <!-- <el-option label="全部" :value="3"></el-option>-->
<el-option label="拆零" :value="1"></el-option> <!-- <el-option label="拆零" :value="1"></el-option>-->
<el-option label="取整" :value="2"></el-option> <!-- <el-option label="取整" :value="2"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!--</el-col>-->
</el-row>
<el-row :gutter="24">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item prop="deptCode" label="所属部门:"> <el-form-item prop="deptCode" label="所属部门:">
<el-select v-model="formData.deptCode" placeholder="请选择部门" clearable <el-select v-model="formData.deptCode" placeholder="请选择部门" clearable
@ -398,6 +401,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="工位负责人:" prop="chargeUser" class="query-form-item"> <el-form-item label="工位负责人:" prop="chargeUser" class="query-form-item">
<el-select v-model="formData.chargeUser" placeholder="请选择负责人" <el-select v-model="formData.chargeUser" placeholder="请选择负责人"
@ -415,6 +422,21 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col">
<el-form-item label="所属组别:" prop="constituencies" class="query-form-item">
<el-select v-model="formData.constituencies" placeholder="请选择所属组别"
style="width: 80%">
<el-option
v-for="item in fromDeptOptions"
:key="item.code"
:label="item.label"
:value="item.code"
>
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
@ -437,21 +459,7 @@
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!--</el-col>--> <!--</el-col>-->
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12" class="el-col">
<el-form-item label="所属组别:" prop="constituencies" class="query-form-item">
<el-select v-model="formData.constituencies" placeholder="请选择所属组别"
style="width: 80%">
<el-option
v-for="item in fromDeptOptions"
:key="item.code"
:label="item.label"
:value="item.code"
>
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="备注:" prop="remake" class="query-form-item"> <el-form-item label="备注:" prop="remake" class="query-form-item">
<el-input <el-input
@ -739,9 +747,9 @@ export default {
workplaceStatus: [ workplaceStatus: [
{ required: true, message: '请选择工位状态', trigger: 'blur' } { required: true, message: '请选择工位状态', trigger: 'blur' }
], ],
workplaceType: [ // workplaceType: [
{ required: true, message: '请选择工位类型', trigger: 'blur' } // { required: true, message: '请选择工位类型', trigger: 'blur' }
] // ]
}, },
invQuery: { invQuery: {
invCode: '', invCode: '',
@ -759,8 +767,8 @@ export default {
3: '按单不校验三期' 3: '按单不校验三期'
}, },
inoutTypes: { inoutTypes: {
1: '入库', 1: '是',
2: '出库' 2: '否'
}, },
corpTypeMap: { corpTypeMap: {
1: '客户', 1: '客户',
@ -781,7 +789,7 @@ export default {
0: '暂停', 0: '暂停',
1: '启用' 1: '启用'
}, },
workplaceTypeMao: { workplaceTypeMap: {
1: '拆零', 1: '拆零',
2: '取整', 2: '取整',
3: '全部' 3: '全部'
@ -870,7 +878,6 @@ export default {
workplaceId: null, workplaceId: null,
workplaceName: null, workplaceName: null,
workplaceStatus: 1, workplaceStatus: 1,
workplaceType: 3,
deptCode: null, deptCode: null,
chargeUser: null, chargeUser: null,
constituencies: '1001', constituencies: '1001',

Write Preview
Loading…
Cancel
Save