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

工位的界面相关修改

Browse Source
20240912_adapter_z
yewj 1 year ago
parent 6a7607c794
commit e5bb9d4788
3 changed files with 239 additions and 245 deletions
Show Stats Download Patch File Download Diff File

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

@ -25,7 +25,7 @@
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="是否配套系统:" prop="isMatching" class="query-form-item">
<el-select v-model="formData.isMatching" style="width: 80%" placeholder="选择扫码方式" clearable
<el-select v-model="formData.isMatching" style="width: 80%" placeholder="选择扫码方式"
@change="change"
>
<el-option label="否" :value="0"></el-option>
@ -37,7 +37,6 @@
<el-form-item label="单据类型:" prop="documentTypeCode" class="query-form-item">
<el-select v-model="formData.documentTypeCode" placeholder="请选择单据类型"
style="width: 80%"
clearable
>
<el-option
v-for="item in busTypes"
@ -55,7 +54,7 @@
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="扫码方式:" prop="scanType" class="query-form-item">
<el-select v-model="formData.scanType" style="width: 80%" placeholder="选择扫码方式" clearable
<el-select v-model="formData.scanType" style="width: 80%" placeholder="选择扫码方式"
@change="changeCheckInsert"
>
<el-option label="扫码生成业务单" :value="1"></el-option>
@ -78,10 +77,11 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="异常提醒方式:" prop="warnType" class="query-form-item">
<el-select v-model="formData.warnType" style="width: 80%" placeholder="选择扫码方式" clearable>
<el-select v-model="formData.warnType" style="width: 80%" placeholder="选择扫码方式">
<el-option label="信息提醒" :value="1"></el-option>
<el-option label="信息弹框提醒" :value="2"></el-option>
<el-option label="不提醒" :value="3"></el-option>
@ -91,37 +91,18 @@
<el-col :span="12" class="el-col">
<el-form-item label="单据流通方式:" prop="orderCirType" class="query-form-item">
<el-select v-model="formData.orderCirType" style="width: 80%" placeholder="选择扫码方式" clearable>
<el-select v-model="formData.orderCirType" style="width: 80%" placeholder="选择单据流通方式">
<el-option label="配送流通" :value="1"></el-option>
<el-option label="出库使用" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-col :span="12" class="el-col">
<el-form-item label="默认仓库:" prop="invCode" class="query-form-item">
<el-select v-model="formData.invCode" placeholder="请选择仓库"
style="width: 80%"
clearable
@change="handleInvChange"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="往来单位类型:" prop="corpType" class="query-form-item">
<el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型" clearable>
<el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型">
<el-option label="客户" :value="1"></el-option>
<el-option label="供应商" :value="2"></el-option>
<el-option label="内部科室" :value="3"></el-option>
@ -139,10 +120,26 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="默认仓库:" prop="invCode" class="query-form-item">
<el-select v-model="formData.invCode" placeholder="请选择仓库"
style="width: 80%"
clearable
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="往来单位类型:" prop="corpType" class="query-form-item">-->
<!-- <el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型" clearable>-->
@ -252,7 +249,7 @@ export default {
getInvList() {
let query = {
advanceType: 1,
deptCode: this.busData.deptCode
// deptCode: this.busData.deptCode
}
getInvListByUser(query)
.then((response) => {
@ -357,7 +354,11 @@ export default {
this.$set(this.formRules.unitTittle, 0, {required: true, message: '请输入往来类型标题', trigger: 'blur'});
}
},
changeCheckInsert() {
if (this.formData.operationType == 1) {
this.formData.checkInsert = 1
}
},
},
watch: {
// 监听scanType的变化，以更新校验规则

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

@ -128,7 +128,7 @@
<el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140"></el-table-column>
<el-table-column label="备注" prop="remake" width="140"></el-table-column>
<el-table-column label="操作" fixed="right" width="120">
<el-table-column label="操作" fixed="right" width="160">
<template slot-scope="scope">
<el-button
type="text"
@ -331,7 +331,7 @@
<el-form :model="formData" style="width: 100%;" ref="dataForm" :rules="formRules"
label-width="auto"
>
<el-row :gutter="24" class="el-row">
<el-row :gutter="24">
<el-col :span="12" class="el-col">
<el-form-item label="工位编码:" prop="workplaceId" class="query-form-item">
<el-input
@ -350,45 +350,28 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" class="el-row">
<el-row :gutter="24">
<el-col :span="12" class="el-col">
<el-form-item label="作业方式:" prop="operationType" class="query-form-item">
<el-select v-model="formData.operationType" style="width: 80%" placeholder="选择扫码方式" clearable
@change="changeCheckInsert"
>
<el-option label="扫码生成业务单" :value="1"></el-option>
<el-option label="按单校验三期" :value="2"></el-option>
<el-option label="按单不校验三期" :value="3"></el-option>
<el-form-item label="工位状态:" prop="workplaceStatus" class="query-form-item">
<el-select v-model="formData.workplaceStatus" style="width: 80%" placeholder="工位状态">
<el-option label="暂停" :value="0"></el-option>
<el-option label="启用" :value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="结果处理:" prop="checkInsert" class="query-form-item">
<el-select v-model="formData.checkInsert" style="width: 80%" placeholder="选择扫码方式" clearable
:disabled="formData.operationType == 1"
>
<el-option label="自动添加" :value="1"></el-option>
<el-option label="自动不添加" :value="2"></el-option>
<el-option label="根据提醒决定" :value="3"></el-option>
</el-select>
</el-form-item>
</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-col :span="12" class="el-col">
<el-form-item label="异常提醒方式:" prop="warnType" class="query-form-item">
<el-select v-model="formData.warnType" style="width: 80%" placeholder="选择扫码方式" clearable>
<el-option label="信息提醒" :value="1"></el-option>
<el-option label="信息弹框提醒" :value="2"></el-option>
<el-option label="不提醒" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
</el-row>
<el-row :gutter="24">
<el-col :span="12" class="el-col">
<el-form-item prop="deptCode" label="所属部门:">
<el-select v-model="formData.deptCode" placeholder="请选择部门" clearable
style="width: 80%"
@ -405,25 +388,6 @@
</el-select>
</el-form-item>
</el-col>
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="默认仓库:" prop="invCode" class="query-form-item">-->
<!-- <el-select v-model="formData.invCode" placeholder="请选择仓库"-->
<!-- style="width: 80%"-->
<!-- clearable-->
<!-- @change="handleInvChange"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in invList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code"-->
<!-- >-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<el-col :span="12" class="el-col">
<el-form-item label="工位负责人:" prop="chargeUser" class="query-form-item">
<el-select v-model="formData.chargeUser" placeholder="请选择负责人"
@ -439,20 +403,20 @@
<span style="float: left">{{ item.employeeName }}</span>
</el-option>
</el-select>
<!--<el-input-->
<!-- v-model="formData.chargeUser" style="width: 80%"-->
<!-- auto-complete="off"-->
<!--&gt;</el-input>-->
</el-form-item>
</el-col>
</el-row>
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="单据类型:" prop="orderId" class="query-form-item">-->
<!-- <el-select v-model="formData.orderId" placeholder="请选择单据类型"-->
<!-- <el-form-item label="默认仓库:" prop="invCode" class="query-form-item">-->
<!-- <el-select v-model="formData.invCode" placeholder="请选择仓库"-->
<!-- style="width: 80%"-->
<!-- clearable-->
<!-- @change="handleInvChange"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in busTypes"-->
<!-- v-for="item in invList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code"-->
@ -462,6 +426,7 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<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="请选择所属组别"
@ -479,6 +444,48 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="库存预警数:" prop="invRemindNumber" class="query-form-item">
<el-input-number
:min="0"
:precision="0" :step="1"
placeholder="请输入库存预警数"
v-model="formData.invRemindNumber" style="width: 80%"
auto-complete="off"
></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="备注:" prop="remake" class="query-form-item">
<el-input
v-model="formData.remake" style="width: 100%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
</el-row>
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="单据类型:" prop="orderId" class="query-form-item">-->
<!-- <el-select v-model="formData.orderId" placeholder="请选择单据类型"-->
<!-- style="width: 80%"-->
<!-- clearable-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in busTypes"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code"-->
<!-- >-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="往来单位类型:" prop="corpType" class="query-form-item">-->
<!-- <el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型" clearable>-->
@ -499,35 +506,7 @@
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<el-col :span="12" class="el-col">
<el-form-item label="库存预警数:" prop="invRemindNumber" class="query-form-item">
<el-input-number
:min="0"
:precision="0" :step="1"
placeholder="请输入库存预警数"
v-model="formData.invRemindNumber" style="width: 80%"
auto-complete="off"
></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="工位状态:" prop="workplaceStatus" class="query-form-item">
<el-select v-model="formData.workplaceStatus" style="width: 80%" placeholder="工位状态" clearable>
<el-option label="暂停" :value="0"></el-option>
<el-option label="启用" :value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<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="工位状态" clearable>
<el-option label="拆零" :value="1"></el-option>
<el-option label="取整" :value="2"></el-option>
<el-option label="全部" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="往来单位类型:" prop="corpType" class="query-form-item">-->
@ -539,16 +518,7 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<el-row :gutter="24" class="el-row">
<el-col :span="22" class="el-col">
<el-form-item label="备注:" prop="remake" class="query-form-item">
<el-input
v-model="formData.remake" style="width: 100%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
@ -562,19 +532,18 @@
</div>
</el-dialog>
<el-dialog
:title="formMap[formName]"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
:visible.sync="subFormVisible"
width="60%"
width="45%"
top="5vh"
>
<el-form :model="subData" ref="dataForm" label-width="80px">
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-col class="el-col">
<el-form-item label="上级菜单" prop="parentCode">
<el-select v-model="subData.parentCode" placeholder="选择上级菜单"
style="width: 80%"
@ -593,7 +562,10 @@
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col class="el-col">
<el-form-item label="名称" prop="name" class="query-form-item">
<el-input
v-model="subData.name" style="width: 80%"
@ -609,7 +581,7 @@
<el-input
v-model="subData.remark"
type="textarea"
style="width: 90%"
style="width: 80%"
auto-complete="off"
></el-input>
</el-form-item>
@ -709,8 +681,15 @@ export default {
'edit': '编辑业务类型'
},
formData: {
operationType: 1,
deptCode: null
workplaceId: null,
workplaceName: null,
workplaceStatus: 1,
workplaceType: 3,
deptCode: null,
chargeUser: null,
constituencies: null,
invRemindNumber: 0,
remake: null,
},
workplaceCode: '6001',
unitStorageList: [],
@ -727,9 +706,9 @@ export default {
checkInsert: [
{required: true, message: '处理结果不能为空', trigger: 'blur'}
],
invRemindNumber: [
{ required: true, message: '请输入工位存量提醒数', trigger: 'blur' }
],
// invRemindNumber: [
// { required: true, message: '请输入工位存量提醒数', trigger: 'blur' }
// ],
warnType: [
{required: true, message: '请选择提醒方式', trigger: 'blur'}
],
@ -865,22 +844,25 @@ export default {
},
addWorkplace() {
this.fromName = 'add'
this.formData = {
workplaceId: null,
workplaceName: null,
workplaceStatus: 1,
workplaceType: 3,
deptCode: null,
chargeUser: null,
constituencies: null,
invRemindNumber: 0,
remake: null,
};
this.getDeptList()
createWorkplaceId().then(res => {
if (res.code == 20000) {
if (res.data == null) {
this.formData.workplaceId = this.workplaceCode + 1001
this.formData.operationType = 1
this.formData.checkInsert = 1
this.formData.workplaceStatus = 1
this.addWorkplaceDialogVisible = true
this.getTree()
} else {
this.formData = {
operationType: 1,
checkInsert: 1,
workplaceStatus: 1
}
this.getTree()
this.formData.workplaceId = res.data
this.addWorkplaceDialogVisible = true
@ -1171,7 +1153,7 @@ export default {
this.$message.success('删除成功')
this.getLstTree()
} else {
this.$message.error('删除失败')
this.$message.error(res.message)
}
})
},

39
src/views/collect/IoCreateOrder.vue
Unescape Escape View File

@ -29,12 +29,12 @@
</el-col>
</el-row>
<!--<el-alert-->
<!-- style="margin-top: 15px;margin-bottom: 10px;font-size: 20px;"-->
<!-- :title="msgTip"-->
<!-- :closable="false"-->
<!-- type="warning">-->
<!--</el-alert>-->
<el-alert
style="margin-top: 15px;margin-bottom: 10px;font-size: 20px;"
:title="msgTip"
:closable="false"
type="warning">
</el-alert>
<el-row>
@ -157,7 +157,7 @@
</el-col>
<el-col :span="8" v-if="splitType=='out'">
<el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:">
<el-radio-group v-model="orderFormData.fifoSplit">
<el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable">
<el-radio :label="1">拆零上货</el-radio>
<el-radio :label="2">整取上货</el-radio>
</el-radio-group>
@ -517,7 +517,9 @@ export default {
scanResultType: "success",
msgTip: "当前工位存量提醒：",
splitType: null,
rowData: {}
rowData: {},
curWorkPlace: null,
fifoSplitEnable: false,
};
},
components: {
@ -532,15 +534,12 @@ export default {
let post = {
workPlaceCode: val
}
this.defaultSplitType()
findInvRemind(post).then((response) => {
if (response.code === 20000) {
this.msgTip = response.data
} else {
}
})
.catch(() => {
}).catch(() => {
});
},
successCloseData() {
@ -566,6 +565,7 @@ export default {
sickerAdNum: null,
workPlaceCode: null,
fifoSplit: 1,
}
this.orderFormData.workPlaceCode = workPlaceCode
this.scanCode = "";
@ -592,6 +592,16 @@ export default {
.catch(() => {
});
},
defaultSplitType() {
this.curWorkPlace = this.curWorkPlaces.find(item => item.workplaceId == this.orderFormData.workPlaceCode);
this.orderFormData.fifoSplit = this.curWorkPlace.workplaceType
if (this.curWorkPlace.workplaceType == 1 || this.curWorkPlace.workplaceType == 2) {
this.fifoSplitEnable = true;
} else {
this.orderFormData.fifoSplit = 1;
this.fifoSplitEnable = false;
}
},
//仓库改变
changeInv(row) {
this.orderFormData.action = null;
@ -942,8 +952,9 @@ export default {
}
listPage(query).then((res) => {
this.curWorkPlaces = res.data.list || [];
if (this.curWorkPlaces.length == 1) {
if (this.curWorkPlaces.length == 1 && this.$isNotBlank(this.orderFormData.workPlaceCode)) {
this.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
this.defaultSplitType()
}
})
},

Write Preview
Loading…
Cancel
Save