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

工位的界面相关修改

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

103
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>-->
@ -178,10 +175,10 @@
</template>
<script>
import { getInvListByUser } from '@/api/system/invWarehouse'
import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType'
import { getBusTypeList } from '@/api/basic/busType'
import { addBusType, updateType } from '@/api/basic/workPlace/sysWorkplaceDocuments'
import {getInvListByUser} from '@/api/system/invWarehouse'
import {getCollectBusType} from '@/api/basic/collectPoint/gatherOrderType'
import {getBusTypeList} from '@/api/basic/busType'
import {addBusType, updateType} from '@/api/basic/workPlace/sysWorkplaceDocuments'
export default {
props: {
@ -219,25 +216,25 @@ export default {
busTypes: [],
formRules: {
busName: [
{ required: true, message: '请输入业务名称', trigger: 'blur' }
{required: true, message: '请输入业务名称', trigger: 'blur'}
],
isMatching: [
{ required: true, message: '请选择是否配套系统', trigger: 'blur' }
{required: true, message: '请选择是否配套系统', trigger: 'blur'}
],
documentTypeCode: [
{ required: true, message: '请选择单据类型', trigger: 'blur' }
{required: true, message: '请选择单据类型', trigger: 'blur'}
],
scanType: [
{ required: true, message: '请选择扫码方式', trigger: 'blur' }
{required: true, message: '请选择扫码方式', trigger: 'blur'}
],
checkInsert: [
{ required: true, message: '处理结果不能为空', trigger: 'blur' }
{required: true, message: '处理结果不能为空', trigger: 'blur'}
],
warnType: [
{ required: true, message: '请选择异常方式提醒', trigger: 'blur' }
{required: true, message: '请选择异常方式提醒', trigger: 'blur'}
],
orderCirType: [
{ required: true, message: '请选择单据流通方式', trigger: 'blur' }
{required: true, message: '请选择单据流通方式', trigger: 'blur'}
],
corpType: [
// { required: true, message: '请选择往来单位类型', trigger: 'blur' }
@ -252,7 +249,7 @@ export default {
getInvList() {
let query = {
advanceType: 1,
deptCode: this.busData.deptCode
// deptCode: this.busData.deptCode
}
getInvListByUser(query)
.then((response) => {
@ -324,7 +321,7 @@ export default {
})
} else {
this.$refs['dataForm'].validate((rules) => {
if (rules){
if (rules) {
addBusType(this.formData).then(res => {
if (res.code == 20000) {
this.$message.success('新增成功')
@ -333,7 +330,7 @@ export default {
this.$message.error('新增失败')
}
})
}else {
} else {
}
})
@ -349,19 +346,23 @@ export default {
updateFormRules() {
if (this.formData.scanType === 1) {
// 当scanType为1时，不校验corpType和unitTittle
this.$set(this.formRules.corpType, 0, { required: false });
this.$set(this.formRules.unitTittle, 0, { required: false });
this.$set(this.formRules.corpType, 0, {required: false});
this.$set(this.formRules.unitTittle, 0, {required: false});
} else {
// 其他情况，设置校验规则
this.$set(this.formRules.corpType, 0, { required: true, message: '请选择往来单位类型', trigger: 'blur' });
this.$set(this.formRules.unitTittle, 0, { required: true, message: '请输入往来类型标题', trigger: 'blur' });
this.$set(this.formRules.corpType, 0, {required: true, message: '请选择往来单位类型', trigger: 'blur'});
this.$set(this.formRules.unitTittle, 0, {required: true, message: '请输入往来类型标题', trigger: 'blur'});
}
},
changeCheckInsert() {
if (this.formData.operationType == 1) {
this.formData.checkInsert = 1
}
},
},
watch: {
// 监听scanType的变化，以更新校验规则
'formData.scanType': function(newVal, oldVal) {
'formData.scanType': function (newVal, oldVal) {
this.updateFormRules();
}
},

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

@ -73,7 +73,7 @@
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="当前部门:" class="query-form-item">
<deptSelect style="width: 68%" :value.sync="query.deptCode"/>
<deptSelect style="width: 68%" :value.sync="query.deptCode"/>
<!--<deptSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>-->
</el-form-item>
</el-col>
@ -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"
@ -263,9 +263,9 @@
</template>
</el-table-column>
<el-table-column label="扫码方式" prop="scanType">
<template slot-scope="scope">
<span>{{ operationTypes[scope.row.scanType] }}</span>
</template>
<template slot-scope="scope">
<span>{{ operationTypes[scope.row.scanType] }}</span>
</template>
</el-table-column>
<el-table-column label="处理结果 " prop="checkInsert">
<template slot-scope="scope">
@ -283,9 +283,9 @@
</template>
</el-table-column>
<el-table-column label="往来单位类型" prop="corpType" width="100">
<template slot-scope="scope">
<span>{{ corpTypeMap[scope.row.corpType] }}</span>
</template>
<template slot-scope="scope">
<span>{{ corpTypeMap[scope.row.corpType] }}</span>
</template>
</el-table-column>
<el-table-column label="往来类型标题" prop="unitTittle" width="100"></el-table-column>
<el-table-column label="操作" fixed="right" width="120">
@ -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,29 +403,30 @@
<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-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-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">
<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,26 +444,6 @@
</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>-->
<!-- <el-option label="客户" :value="1"></el-option>-->
<!-- <el-option label="供应商" :value="2"></el-option>-->
<!-- <el-option label="内部科室" :value="3"></el-option>-->
<!-- <el-option label="特殊往来" :value="4"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="往来类型标题:" prop="unitTittle" class="query-form-item">-->
<!-- <el-input-->
<!-- v-model="formData.unitTittle" style="width: 80%"-->
<!-- auto-complete="off"-->
<!-- ></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
@ -510,25 +455,37 @@
></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="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 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>-->
@ -539,16 +496,29 @@
<!-- </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-col :span="12" class="el-col">-->
<!-- <el-form-item label="往来类型标题:" prop="unitTittle" class="query-form-item">-->
<!-- <el-input-->
<!-- v-model="formData.unitTittle" style="width: 80%"-->
<!-- auto-complete="off"-->
<!-- ></el-input>-->
<!-- </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>-->
<!-- <el-option label="客户" :value="1"></el-option>-->
<!-- <el-option label="供应商" :value="2"></el-option>-->
<!-- <el-option label="内部科室" :value="3"></el-option>-->
<!-- <el-option label="特殊往来" :value="4"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
</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>
@ -665,17 +637,17 @@ import {
deleteWorkplace,
createWorkplaceId, printWorkLabel, getUsers
} from '@/api/basic/workPlace/sysWorkplaceManage'
import { filterAllByUser, getInvListByUser } from '@/api/system/invWarehouse'
import { addTree, deleteTree, getTree, updateTree } from '@/api/basic/collectPoint/collectPointManage'
import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType'
import {filterAllByUser, getInvListByUser} from '@/api/system/invWarehouse'
import {addTree, deleteTree, getTree, updateTree} from '@/api/basic/collectPoint/collectPointManage'
import {getCollectBusType} from '@/api/basic/collectPoint/gatherOrderType'
import panelGroup from '@/views/dashboard/PanelGroup'
import { delUserBindWork, getUserBindWork } from '@/api/basic/collectPoint/userWorkplace'
import {delUserBindWork, getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
import selectBusType from './selectBusType'
import addBusTypeDialog from './addBusTypeDialog'
import { getWorkBindBusTypes,removeBusTypeById } from '@/api/basic/workPlace/sysWorkplaceDocuments'
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
export default {
components: { selectBusType,addBusTypeDialog },
components: {selectBusType, addBusTypeDialog},
data() {
return {
query: {
@ -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: [],
@ -719,34 +698,34 @@ export default {
filterBadInv: true,
formRules: {
workplaceName: [
{ required: true, message: '请输入工位名称', trigger: 'blur' }
{required: true, message: '请输入工位名称', trigger: 'blur'}
],
operationType: [
{ required: true, message: '请选择作业方式', trigger: 'blur' }
{required: true, message: '请选择作业方式', trigger: 'blur'}
],
checkInsert: [
{ required: true, message: '处理结果不能为空', trigger: 'blur' }
],
invRemindNumber: [
{ required: true, message: '请输入工位存量提醒数', trigger: 'blur' }
{required: true, message: '处理结果不能为空', trigger: 'blur'}
],
// invRemindNumber: [
// { required: true, message: '请输入工位存量提醒数', trigger: 'blur' }
// ],
warnType: [
{ required: true, message: '请选择提醒方式', trigger: 'blur' }
{required: true, message: '请选择提醒方式', trigger: 'blur'}
],
corpType: [
{ required: true, message: '请选择往来单位类型', trigger: 'blur' }
{required: true, message: '请选择往来单位类型', trigger: 'blur'}
],
orderId: [
{ required: true, message: '请选择单据类型', trigger: 'blur' }
{required: true, message: '请选择单据类型', trigger: 'blur'}
],
unitTittle: [
{ required: true, message: '请输入往来类型标题', trigger: 'blur' }
{required: true, message: '请输入往来类型标题', trigger: 'blur'}
],
workplaceStatus: [
{ required: true, message: '请选择工位状态', trigger: 'blur' }
{required: true, message: '请选择工位状态', trigger: 'blur'}
],
workplaceType: [
{ required: true, message: '请选择工位类型', trigger: 'blur' }
{required: true, message: '请选择工位类型', trigger: 'blur'}
]
},
invQuery: {
@ -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
@ -954,11 +936,11 @@ export default {
edit(row) {
this.formData = row
// this.formData.invCode = String(row.invCode)
if (row.chargeUser == 0){
if (row.chargeUser == 0) {
this.formData.chargeUser = null
}else if(row.chargeUser == 1){
} else if (row.chargeUser == 1) {
this.formData.chargeUser = Number(row.chargeUser)
}else {
} else {
this.formData.chargeUser = row.chargeUser
}
this.fromName = 'edit'
@ -1004,7 +986,7 @@ export default {
},
handleInvChange(deptCode) {
this.invQuery.deptCode = deptCode
this.formData.chargeUser = null
this.formData.chargeUser = null
getUsers(this.invQuery).then(res => {
if (res.code == 20000) {
this.users = res.data.list || []
@ -1019,7 +1001,7 @@ export default {
const binaryData = []
binaryData.push(response)
let url = window.URL.createObjectURL(
new Blob(binaryData, { type: 'application/pdf' })
new Blob(binaryData, {type: 'application/pdf'})
)
this.loading = false
window.open(url)
@ -1075,14 +1057,14 @@ export default {
this.userQuery.workplaceCode = this.rowData.workplaceId
this.getUserBindWork(this.userQuery)
},
onBusTypeReset(){
this.busQuery= {
onBusTypeReset() {
this.busQuery = {
busKey: '',
workplaceCode: null,
page: 1,
limit: 10
},
this.getWorkBindBusTypes()
this.getWorkBindBusTypes()
},
loadBusList() {
this.getWorkBindBusTypes()
@ -1171,7 +1153,7 @@ export default {
this.$message.success('删除成功')
this.getLstTree()
} else {
this.$message.error('删除失败')
this.$message.error(res.message)
}
})
},
@ -1243,7 +1225,7 @@ export default {
if (res.code == 20000) {
this.$message.success('移除成功')
this.getWorkBindBusTypes()
}else {
} else {
this.$message.error("移除失败")
}
})
@ -1251,7 +1233,7 @@ export default {
})
},
updateBusType(row){
updateBusType(row) {
this.upData = row
this.busData = this.rowData
this.busName = 'edit'

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

@ -29,27 +29,27 @@
</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>
<el-button-group
style="display: flex; margin: 0px 0 15px 0; float: right"
>
<!--<el-button size="mini" type="primary" @click.native="saveOrder()" :loading="saveLoading"-->
<!--&gt;草稿保存-->
<!--</el-button>-->
<!--<el-button size="mini" type="primary" @click.native="saveOrder()" :loading="saveLoading"-->
<!--&gt;草稿保存-->
<!--</el-button>-->
<el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
v-if="splitType=='out'"style="margin-right: 8px;border-radius: 5%;"
v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
>选入草稿单据
</el-button>
<el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
v-if="splitType=='out'"style="margin-right: 8px;border-radius: 5%;"
v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
>草稿保存
</el-button>
<el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
@ -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>
@ -271,9 +271,9 @@
v-if="chooseDraftOrderVisible"
>
<chooseDraftOrderDialog
:rowData="rowData"
:closeChooseDialog="closeChooseDialog"
:handleChoose="handleChoose"
:rowData="rowData"
:closeChooseDialog="closeChooseDialog"
:handleChoose="handleChoose"
>
</chooseDraftOrderDialog>
</el-dialog>
@ -517,7 +517,9 @@ export default {
scanResultType: "success",
msgTip: "当前工位存量提醒：",
splitType: null,
rowData: {}
rowData: {},
curWorkPlace: null,
fifoSplitEnable: false,
};
},
components: {
@ -525,23 +527,20 @@ export default {
codeDetailPanel,
editCodeDialog,
DialogCreateOrderSelect,
DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct,chooseDraftOrderDialog
DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct, chooseDraftOrderDialog
},
methods: {
changeInvRemind(val) {
let post = {
workPlaceCode: val
}
this.defaultSplitType()
findInvRemind(post).then((response) => {
if (response.code === 20000) {
this.msgTip = response.data
} else {
}
})
.catch(() => {
});
}).catch(() => {
});
},
successCloseData() {
let workPlaceCode = this.orderFormData.workPlaceCode
@ -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()
}
})
},
@ -1444,7 +1455,7 @@ export default {
}
},
//选入草稿单据
chooseDraftOrder(){
chooseDraftOrder() {
if (this.$isBlank(this.orderFormData.workPlaceCode)) {
this.$message.warning("请选择工位！");
return;
@ -1453,10 +1464,10 @@ export default {
this.rowData.fifoSplit = this.orderFormData.fifoSplit
this.chooseDraftOrderVisible = true
},
closeChooseDialog(){
closeChooseDialog() {
this.chooseDraftOrderVisible = false
},
handleChoose(billNo){
handleChoose(billNo) {
this.orderFormData.billNo = billNo
this.refreshCodesPanel();
},

Write Preview
Loading…
Cancel
Save