Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

20240912_adapter_z
chenhc 8 months ago
commit fe150a67bb

@ -27,6 +27,23 @@ export function bindBusType(query) {
export function addBusType(query) {
return axios({
url: "/udiwms/sysWorkplace/addBusType",
method: "post",
data: query
});
}
export function updateType(query) {
return axios({
url: "/udiwms/sysWorkplace/updateType",
method: "post",
data: query
});
}

@ -31,22 +31,23 @@
<el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"
>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column label="单据类型编号" prop="code"></el-table-column>
<!--<el-table-column label="单据类型编号" prop="code"></el-table-column>-->
<el-table-column label="单据类型编号" prop="fromBusTypeCode"></el-table-column>
<el-table-column label="单据类型名称" prop="name"></el-table-column>
<el-table-column label="出入库类型" prop="mainAction">
<template slot-scope="scope">
<span>{{ mainActions[scope.row.mainAction] }}</span>
</template>
</el-table-column>
<el-table-column label="是否内部单据" prop="innerOrder">
<template slot-scope="scope">
<span>{{ innerOrderMap[scope.row.innerOrder] }}</span>
</template>
</el-table-column>
<el-table-column label="来源系统" prop="fromType"></el-table-column>
<el-table-column label="来源单据类型" prop="fromDocumentType"></el-table-column>
<el-table-column label="来源单据编号" prop="fromInterAddress"></el-table-column>
<el-table-column label="排序" prop="sortNumber" width="50"></el-table-column>
<!--<el-table-column label="出入库类型" prop="mainAction">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ mainActions[scope.row.mainAction] }}</span>-->
<!-- </template>-->
<!--</el-table-column>-->
<!--<el-table-column label="是否内部单据" prop="innerOrder">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ innerOrderMap[scope.row.innerOrder] }}</span>-->
<!-- </template>-->
<!--</el-table-column>-->
<el-table-column label="单据来源" prop="fromType"></el-table-column>
<!--<el-table-column label="来源单据类型" prop="fromDocumentType"></el-table-column>-->
<!--<el-table-column label="来源接口地址" prop="fromInterAddress"></el-table-column>-->
<!--<el-table-column label="排序" prop="sortNumber" width="50"></el-table-column>-->
<el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope">
@ -79,11 +80,20 @@
>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="单据类型编号:" prop="code" class="query-form-item">
<!--<el-form-item label="单据类型编号:" prop="code" class="query-form-item">-->
<!-- <el-input-->
<!-- placeholder="请输入单据类型编号"-->
<!-- disabled-->
<!-- v-model="formData.code" 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="fromBusTypeCode" class="query-form-item">
<el-input
placeholder="请输入单据类型编号"
disabled
v-model="formData.code" style="width: 80%"
v-model="formData.fromBusTypeCode" style="width: 80%"
auto-complete="off"
></el-input>
</el-form-item>
@ -97,22 +107,25 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="出入库类型:" prop="mainAction" class="query-form-item">
<el-select v-model="formData.mainAction" style="width: 80%" placeholder="请选择出入库类型" clearable>
<el-option label="出库" :value="mainActionMap.out"></el-option>
<el-option label="入库" :value="mainActionMap.in"></el-option>
</el-select>
</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="innerOrder" class="query-form-item">-->
<!-- <el-form-item label="出入库类型:" prop="mainAction" class="query-form-item">-->
<!-- <el-select v-model="formData.mainAction" style="width: 80%" placeholder="请选择出入库类型" clearable>-->
<!-- <el-option label="出库" :value="mainActionMap.out"></el-option>-->
<!-- <el-option label="入库" :value="mainActionMap.in"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="el-col">-->
<!-- <el-form-item label="是否内单据:" prop="innerOrder" class="query-form-item">-->
<!-- <el-select v-model="formData.innerOrder" 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-row>-->
<!--<el-row :gutter="24" class="el-row">-->
<!-- <el-col :span="12" class="el-col">-->
<!-- <el-form-item label="出入库类型:" prop="mainAction" class="query-form-item">-->
@ -131,25 +144,28 @@
<!-- </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="name" class="query-form-item">
<el-form-item label="单据来源:" prop="name" class="query-form-item">
<el-input
placeholder="请输入来源系统"
placeholder="请输入单据来源"
v-model="formData.fromType" 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="fromDocumentType" class="query-form-item">
<el-input
placeholder="请输入来源单据类型"
v-model="formData.fromDocumentType" 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="fromDocumentType" class="query-form-item">-->
<!-- <el-input-->
<!-- placeholder="请输入来源单据类型"-->
<!-- v-model="formData.fromDocumentType" style="width: 80%"-->
<!-- auto-complete="off"-->
<!-- ></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="fromInterAddress" class="query-form-item">-->
<!-- <el-input-->
@ -159,18 +175,20 @@
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<el-col :span="12" class="el-col">
<el-form-item label="排序:" prop="sortNumber" class="query-form-item">
<el-input-number
:min="0"
:max="999"
:precision='0' :step='1'
placeholder="数字越大字段排在越前面"
v-model="formData.sortNumber" 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="sortNumber" class="query-form-item">-->
<!-- <el-input-number-->
<!-- :min="0"-->
<!-- :max="999"-->
<!-- :precision='0' :step='1'-->
<!-- placeholder="数字越大字段排在越前面"-->
<!-- v-model="formData.sortNumber" 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="22" class="el-col">
<el-form-item label="备注:" prop="remark" class="query-form-item">
<el-input

@ -2,11 +2,11 @@
<div>
<el-form :model="query" label-width="auto" v-show="showSearch" size="mini" class="order-el-form">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="当前仓库:" class="query-form-item">
<invSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>
</el-form-item>
</el-col>
<!--<el-col :span="8">-->
<!-- <el-form-item label="当前仓库:" class="query-form-item">-->
<!-- <invSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<el-col :span="8">
<el-form-item label="编码/名称:" class="query-form-item">
<el-input v-model="query.key" placeholder="请输入编码/工位名称" clearable>
@ -47,33 +47,19 @@
<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="workplaceName" width="120"></el-table-column>
<el-table-column label="所属组别" prop="categoryName" width="90"></el-table-column>
<el-table-column label="来源单据类型编号" prop="busTypeCode" width="150"></el-table-column>
<el-table-column label="来源单据类型名称" prop="busTypeName" width="150"></el-table-column>
<el-table-column label="所属部门" prop="deptCode" width="90"></el-table-column>
<el-table-column label="默认仓库" prop="invName" width="90"></el-table-column>
<el-table-column label="作业方式" prop="operationType" width="90">
<el-table-column label="工位状态" prop="workplaceStatus" width="90">
<template slot-scope="scope">
<span>{{operationTypes[scope.row.operationType]}}</span>
<span>{{ workplaceStatusMap[scope.row.workplaceStatus] }}</span>
</template>
</el-table-column>
<el-table-column label="结果处理" prop="checkInsert" width="150">
<el-table-column label="工位类型" prop="workplaceType" width="90">
<template slot-scope="scope">
<span>{{checkInserts[scope.row.checkInsert]}}</span>
</template>
</el-table-column>
<el-table-column label="提醒方式" prop="warnType" width="90">
<template slot-scope="scope">
<span>{{warnTypeMap[scope.row.warnType]}}</span>
</template>
</el-table-column>
<el-table-column label="负责人" prop="employeeName" width="90"></el-table-column>
<el-table-column label="往来单位标题" prop="unitTittle" width="100"></el-table-column>
<el-table-column label="往来单位类型" prop="corpType" width="100">
<template slot-scope="scope">
<span>{{ corpTypeMap[scope.row.corpType] }}</span>
<span>{{ workplaceTypes[scope.row.workplaceType] }}</span>
</template>
</el-table-column>
<el-table-column label="所属部门" prop="deptCodeName" width="90"></el-table-column>
<el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>
<el-table-column label="工位负责人" prop="employeeName" width="90"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="90"></el-table-column>
<el-table-column label="备注" prop="remake" width="90"></el-table-column>
<el-table-column label="操作" fixed="right" width="50">
@ -314,7 +300,6 @@ export default {
data() {
return {
query: {
invCode: this.$store.getters.locInvCode,
page: 1,
limit: 20,
code: null
@ -360,9 +345,9 @@ export default {
3: '按单不校验三期'
},
checkInserts: {
1: '插入',
2: '不插入',
3: '提醒是否插入'
1: '自动添加',
2: '自动不添加',
3: '根据提醒决定'
},
warnTypeMap: {
1: '信息提醒',
@ -375,6 +360,15 @@ export default {
3: '内部科室',
4: '特殊往来',
},
workplaceStatusMap:{
0: '暂停',
1: '启用'
},
workplaceTypes:{
1: '拆零',
2: '取整',
3: '全部',
},
radioCheck: '',
rowData: {},
rowList:[]

@ -109,29 +109,25 @@
<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="workplaceName" width="90"></el-table-column>
<!--<el-table-column label="所属仓库" prop="invName" width="90"></el-table-column>-->
<el-table-column label="作业方式" prop="operationType" width="90">
<el-table-column label="所属部门" prop="deptCodeName" width="90"></el-table-column>
<el-table-column label="工位状态" prop="workplaceStatus" width="90">
<template slot-scope="scope">
<span>{{ operationTypes[scope.row.operationType] }}</span>
<span>{{ workplaceStatusMap[scope.row.workplaceStatus] }}</span>
</template>
</el-table-column>
<el-table-column label="结果处理" prop="checkInsert" width="100">
<el-table-column label="工位类型" prop="workplaceType" width="90">
<template slot-scope="scope">
<span>{{ checkInserts[scope.row.checkInsert] }}</span>
</template>
</el-table-column>
<el-table-column label="提醒方式" prop="warnType" width="90">
<template slot-scope="scope">
<span>{{ warnTypeMap[scope.row.warnType] }}</span>
</template>
</el-table-column>
<el-table-column label="负责人" prop="employeeName" width="90"></el-table-column>
<el-table-column label="往来单位标题" prop="unitTittle" width="100"></el-table-column>
<el-table-column label="往来单位类型" prop="corpType" width="100">
<template slot-scope="scope">
<span>{{ corpTypeMap[scope.row.corpType] }}</span>
<span>{{ workplaceTypes[scope.row.workplaceType] }}</span>
</template>
</el-table-column>
<el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>
<el-table-column label="工位负责人" prop="employeeName" width="90"></el-table-column>
<!--<el-table-column label="往来单位标题" prop="unitTittle" width="100"></el-table-column>-->
<!--<el-table-column label="往来单位类型" prop="corpType" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ corpTypeMap[scope.row.corpType] }}</span>-->
<!-- </template>-->
<!--</el-table-column>-->
<el-table-column label="创建时间" prop="createTime" width="90"></el-table-column>
<el-table-column label="备注" prop="remake" width="90"></el-table-column>
<el-table-column label="操作" fixed="right" width="100">
@ -156,7 +152,7 @@
:total="workTotal"
:limit.sync="workQuery.limit"
:page.sync="workQuery.page"
@pagination=" getUserBindWork(workQuery)"
@pagination="getUserBindWork()"
>
</pagination>
</el-tab-pane>
@ -225,14 +221,14 @@
</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: 100%" placeholder="选择扫码方式" clearable disabled>
<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-form-item label="结果处理:" prop="checkInsert" class="query-form-item">-->
<!-- <el-select v-model="formData.checkInsert" style="width: 100%" placeholder="选择扫码方式" clearable disabled>-->
<!-- <el-option label="不插入" :value="1"></el-option>-->
<!-- <el-option label="插入" :value="2"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
</el-row>
<el-row :gutter="24" class="el-row">
@ -245,15 +241,15 @@
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="往来类型标题:" prop="remake" class="query-form-item">
<el-input
disabled
v-model="formData.unitTittle" style="width: 100%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="往来类型标题:" prop="remake" class="query-form-item">-->
<!-- <el-input-->
<!-- disabled-->
<!-- v-model="formData.unitTittle" style="width: 100%"-->
<!-- auto-complete="off"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="24" class="el-col">-->
<!-- <el-form-item label="所属仓库:" prop="invCode" class="query-form-item">-->
@ -283,15 +279,15 @@
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="作业方式:" prop="chargeUser" class="query-form-item">
<el-input
disabled
v-model="operationTypes[formData.operationType]" style="width: 100%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="作业方式:" prop="chargeUser" class="query-form-item">-->
<!-- <el-input-->
<!-- disabled-->
<!-- v-model="operationTypes[formData.operationType]" style="width: 100%"-->
<!-- auto-complete="off"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="24" class="el-col">-->
<!-- <el-form-item label="单据类型:" prop="busType" class="query-form-item">-->
<!-- <el-select v-model="formData.orderId" placeholder="请选择单据类型"-->
@ -387,9 +383,9 @@ export default {
3: '按单不校验三期'
},
checkInserts: {
1: '插入',
2: '不插入',
3: '提醒是否插入'
1: '自动添加',
2: '自动不添加',
3: '根据提醒决定'
},
warnTypeMap: {
1: '信息提醒',
@ -402,6 +398,15 @@ export default {
3: '内部科室',
4: '特殊往来',
},
workplaceStatusMap:{
0: '暂停',
1: '启用'
},
workplaceTypes:{
1: '拆零',
2: '取整',
3: '全部',
},
userId: '',
workPlaceCode: [],
addWorkplaceDialogVisible: false,
@ -474,12 +479,12 @@ export default {
},
handCurrentChange(row) {
this.rowData = row
this.workQuery.userId = row.id
this.employeeName = row.employeeName
this.getUserBindWork(this.workQuery)
this.getUserBindWork()
},
getUserBindWork(query){
getUserBindWork(query).then(res => {
getUserBindWork(){
this.workQuery.userId = this.rowData.id
getUserBindWork(this.workQuery).then(res => {
if (res.code == 20000) {
this.workList = res.data.list || []
this.workTotal= res.data.total || 0

@ -0,0 +1,357 @@
<template>
<div>
<el-form :model="formData" style="width: 100%;" ref="dataForm" :rules="formRules"
label-width="auto"
>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="工位名称:" prop="workplaceName" class="query-form-item">
<el-input
disabled
v-model="busData.workplaceName" 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="busName" class="query-form-item">
<el-input
v-model="formData.busName" style="width: 80%"
auto-complete="off"
></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="isMatching" class="query-form-item">
<el-select v-model="formData.isMatching" style="width: 80%" placeholder="选择扫码方式" clearable
@change="change"
>
<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="documentTypeCode" class="query-form-item">
<el-select v-model="formData.documentTypeCode" 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-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
@change="changeCheckInsert"
>
<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" 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.scanType == 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-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" 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="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-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-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-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">
<el-button @click.native="hideForm">取消</el-button>
<el-button
type="primary"
@click.native="formSubmit()"
>提交
</el-button
>
</div>
</div>
</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'
export default {
props: {
closeDialog: {
type: Function,
required: true
},
workplaceId: {
type: Object,
required: true
},
busData: {
type: Object,
required: true
},
upData: {
type: Object,
required: true
},
// ||
busName: {
type: Object,
required: true
}
},
data() {
return {
formData: {
scanType: 1,
checkInsert: 1,
isMatching: 1,
documentTypeCode: null
},
invList: [],
busTypes: [],
formRules: {
busName: [
{ required: true, message: '请输入业务名称', trigger: 'blur' }
],
isMatching: [
{ required: true, message: '请选择是否配套系统', trigger: 'blur' }
],
documentTypeCode: [
{ required: true, message: '请选择单据类型', trigger: 'blur' }
],
scanType: [
{ required: true, message: '请选择扫码方式', trigger: 'blur' }
],
checkInsert: [
{ required: true, message: '处理结果不能为空', trigger: 'blur' }
],
warnType: [
{ required: true, message: '请选择异常方式提醒', trigger: 'blur' }
],
corpType: [
{ required: true, message: '请选择往来单位类型', trigger: 'blur' }
],
unitTittle: [
{ required: true, message: '请输入往来类型标题', trigger: 'blur' }
],
}
}
},
methods: {
getInvList() {
let query = {
advanceType: 1,
deptCode: this.busData.deptCode
}
getInvListByUser(query)
.then((response) => {
this.invList = response.data || []
})
.catch(() => {
})
},
getBusType() {
let query = {
page: 1,
limit: 50
}
getCollectBusType(query)
.then((response) => {
let busTypeList = response.data.list || []
let busTypes = busTypeList.map(busType => {
return {
code: busType.fromBusTypeCode,
name: busType.name
}
})
this.busTypes = busTypes
})
.catch(() => {
})
},
change() {
this.formData.documentTypeCode = null
if (this.formData.isMatching == 0) {
this.getBusType()
} else {
this.getBusTypeList()
}
},
getBusTypeList() {
let query = {
enable: 1,
page: 1,
limit: 50
}
getBusTypeList(query).then(res => {
if (res.code == 20000) {
this.busTypes = res.data.list || []
let busTypeList = res.data.list || []
// _this.options.getWorkPlace = res.data.list || [];
let busTypes = busTypeList.map(busType => {
return {
code: busType.action,
name: busType.name
}
})
this.busTypes = busTypes
} else {
this.$message.error('获取错误')
}
})
},
formSubmit() {
this.formData.workplaceCode = this.workplaceId
if (this.upData != null) {
updateType(this.formData).then(res => {
if (res.code == 20000) {
this.closeDialog()
this.$message.success('更新成成')
} else {
this.$message.error('更新失败')
}
})
} else {
this.$refs['dataForm'].validate((valid) => {
if (valid){
addBusType(this.formData).then(res => {
if (res.code == 20000) {
this.$message.success('新增成功')
this.closeDialog()
} else {
this.$message.error('新增失败')
}
})
}else {
}
})
// this.formData
}
},
hideForm() {
this.closeDialog()
}
},
created() {
if (this.upData != null) {
this.formData = this.upData
this.formData.invCode = this.upData.invCode + ''
if (this.formData.isMatching == 0) {
this.getBusType()
} else {
this.getBusTypeList()
}
} else {
this.getBusTypeList()
}
this.getInvList()
}
}
</script>
<style scoped>
</style>

@ -1,6 +1,6 @@
<template>
<div>
<el-card>
<el-form :model="query" label-width="auto" v-show="showSearch" size="mini" class="order-el-form">
<el-row :gutter="20">
<!--<el-col :span="8">-->
@ -69,7 +69,7 @@
<!--</el-table-column>-->
</el-table>
</el-card>
</div>
</template>

@ -72,8 +72,9 @@
<el-form :model="query" label-width="auto" v-show="showSearch" size="mini" class="order-el-form">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="当前仓库:" class="query-form-item">
<invSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>
<el-form-item label="当前部门:" class="query-form-item">
<deptSelect style="width: 68%" :value.sync="query.deptCode"/>
<!--<deptSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>-->
</el-form-item>
</el-col>
<el-col :span="8">
@ -107,34 +108,24 @@
<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="workplaceName" width="120"></el-table-column>
<el-table-column label="所属组别" prop="categoryName" width="90"></el-table-column>
<!--<el-table-column label="所属组别" prop="categoryName" width="90"></el-table-column>-->
<!--<el-table-column label="单据类型编号" prop="busTypeCode" width="100"></el-table-column>-->
<!--<el-table-column label="单据类型名称" prop="busTypeName" width="100"></el-table-column>-->
<el-table-column label="单据来源系统" prop="fromTypeName" width="100"></el-table-column>
<!--<el-table-column label="单据来源系统" prop="fromTypeName" width="100"></el-table-column>-->
<el-table-column label="所属部门" prop="deptCodeName" width="90"></el-table-column>
<el-table-column label="默认仓库" prop="invName" width="90"></el-table-column>
<el-table-column label="作业方式" prop="operationType" width="120">
<!--<el-table-column label="默认仓库" prop="invName" width="90"></el-table-column>-->
<el-table-column label="工位类型" prop="workplaceType" width="90">
<template slot-scope="scope">
<span>{{ operationTypes[scope.row.operationType] }}</span>
<span>{{ workplaceTypeMao[scope.row.workplaceType] }}</span>
</template>
</el-table-column>
<el-table-column label="结果处理" prop="checkInsert" width="120">
<el-table-column label="工位状态" prop="workplaceStatus" width="90">
<template slot-scope="scope">
<span>{{ checkInserts[scope.row.checkInsert] }}</span>
</template>
</el-table-column>
<el-table-column label="提醒方式" prop="warnType" width="90">
<template slot-scope="scope">
<span>{{ warnTypeMap[scope.row.warnType] }}</span>
</template>
</el-table-column>
<el-table-column label="负责人" prop="employeeName" width="90"></el-table-column>
<el-table-column label="往来单位标题" prop="unitTittle" width="120"></el-table-column>
<el-table-column label="往来单位类型" prop="corpType" width="100">
<template slot-scope="scope">
<span>{{ corpTypeMap[scope.row.corpType] }}</span>
<span>{{ workplaceStatusMap[scope.row.workplaceStatus] }}</span>
</template>
</el-table-column>
<el-table-column label="工位负责人" prop="employeeName" width="90"></el-table-column>
<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">
@ -231,10 +222,10 @@
<el-form :inline="true" :model="busQuery" class="query-form" size="mini"
style="margin-bottom: 10px"
>
<el-form-item class="query-form-item" label="单据名称/单据编号:">
<el-form-item class="query-form-item" label="单据类型编号/业务名称:">
<el-input
v-model="busQuery.busKey"
placeholder="请输入单据名称/单据编号"
placeholder="请输入单据类型编号/业务名称"
clearable
></el-input>
</el-form-item>
@ -253,7 +244,7 @@
>
<el-button type="primary" @click="chooseBusType"
icon="el-icon-plus"
>添加单据类型
>新增单据类型
</el-button
>
</el-button-group>
@ -263,11 +254,43 @@
highlight-current-row
>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column label="单据编号" prop="code"></el-table-column>
<el-table-column label="单据名称" prop="name"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" fixed="right" width="50">
<el-table-column label="单据类型编码 " prop="documentTypeCode"></el-table-column>
<el-table-column label="业务名称 " prop="busName"></el-table-column>
<el-table-column label="仓库名称 " prop="invName"></el-table-column>
<el-table-column label="是否配套系统" prop="isMatching">
<template slot-scope="scope">
<span>{{ isMatchings[scope.row.isMatching] }}</span>
</template>
</el-table-column>
<el-table-column label="扫码方式" prop="scanType">
<template slot-scope="scope">
<span>{{ operationTypes[scope.row.scanType] }}</span>
</template>
</el-table-column>
<el-table-column label="处理结果 " prop="checkInsert">
<template slot-scope="scope">
<span>{{ checkInserts[scope.row.checkInsert] }}</span>
</template>
</el-table-column>
<el-table-column label="异常方式提醒" prop="warnType">
<template slot-scope="scope">
<span>{{ warnTypeMap[scope.row.warnType] }}</span>
</template>
</el-table-column>
<el-table-column label="往来单位类型" prop="corpType">
<template slot-scope="scope">
<span>{{ corpTypeMap[scope.row.corpType] }}</span>
</template>
</el-table-column>
<el-table-column label="往来类型标题" prop="unitTittle"></el-table-column>
<el-table-column label="操作" fixed="right" width="120">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="updateBusType(scope.row)"
>编辑
</el-button>
<el-button
type="text"
size="small"
@ -342,16 +365,16 @@
<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-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" 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="选择扫码方式" clearable>
<el-option label="信息提醒" :value="1"></el-option>
<el-option label="信息弹框提醒" :value="2"></el-option>
@ -364,7 +387,7 @@
<el-form-item prop="deptCode" label="所属部门:">
<el-select v-model="formData.deptCode" placeholder="请选择部门" clearable
style="width: 80%"
@change="deptChange"
@change="handleInvChange"
>
<el-option
v-for="item in deptList"
@ -378,24 +401,24 @@
</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="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="请选择负责人"
@ -451,26 +474,26 @@
</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="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="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
@ -485,8 +508,17 @@
<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-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>
@ -592,20 +624,30 @@
</el-dialog>
<el-dialog
title="添加单据类型"
:title="busTypeMap[busName]"
:visible.sync="chooseBusTypeDialogVisible"
width="60%"
v-if="chooseBusTypeDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<selectBusType
:closeDialog="closeDialog"
<!--<selectBusType-->
<!-- :closeDialog="closeDialog"-->
<!-- :workplaceId="workplaceId"-->
<!-- :busTypeCodes="busTypeCodes"-->
<!--&gt;-->
<!--</selectBusType>-->
<addBusTypeDialog
:workplaceId="workplaceId"
:busTypeCodes="busTypeCodes"
:busData="busData"
:busName="busName"
:upData="upData"
:closeDialog="closeDialog"
>
</selectBusType>
</addBusTypeDialog>
</el-dialog>
</div>
</template>
@ -624,18 +666,19 @@ import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType'
import panelGroup from '@/views/dashboard/PanelGroup'
import { delUserBindWork, getUserBindWork } from '@/api/basic/collectPoint/userWorkplace'
import selectBusType from './selectBusType'
import addBusTypeDialog from './addBusTypeDialog'
import { getWorkBindBusTypes,removeBusTypeById } from '@/api/basic/workPlace/sysWorkplaceDocuments'
export default {
components: { selectBusType },
components: { selectBusType,addBusTypeDialog },
data() {
return {
query: {
invCode: this.$store.getters.locInvCode,
page: 1,
limit: 10,
code: null,
workplaceStatus: 1
workplaceStatus: 1,
deptCode: ''
},
showSearch: true,
Dictionary: false,
@ -655,6 +698,11 @@ export default {
'add': '新增工位',
'edit': '编辑工位'
},
busName: '',
busTypeMap: {
'add': '新增单据类型',
'edit': '编辑单据类型'
},
formData: {
operationType: 1,
deptCode: null
@ -691,13 +739,21 @@ export default {
],
workplaceStatus: [
{ required: true, message: '请选择工位状态', trigger: 'blur' }
],
workplaceType: [
{ required: true, message: '请选择工位类型', trigger: 'blur' }
]
},
invQuery: {
invCode: ''
invCode: '',
deptCode: ''
},
users: [],
busTypes: [],
isMatchings: {
0: '否',
1: '是'
},
operationTypes: {
1: '扫码生成业务单',
2: '按单校验三期',
@ -710,9 +766,18 @@ export default {
4: '特殊往来'
},
checkInserts: {
1: '插入',
2: '不插入',
3: '提醒是否插入'
1: '自动添加',
2: '自动不添加',
3: '根据提醒决定'
},
workplaceStatusMap: {
0: '暂停',
1: '启用'
},
workplaceTypeMao: {
1: '拆零',
2: '取整',
3: '全部'
},
warnTypeMap: {
1: '信息提醒',
@ -753,7 +818,9 @@ export default {
},
busTypeList: [],
busTypeTotal: 0,
busTypeCodes: []
busTypeCodes: [],
busData: null,
upData: null
}
},
computed: {},
@ -773,7 +840,8 @@ export default {
})
this.query = {
page: 1,
limit: 20
limit: 20,
workplaceStatus: null
}
this.getList()
},
@ -788,6 +856,7 @@ export default {
},
addWorkplace() {
this.fromName = 'add'
this.getDeptList()
createWorkplaceId().then(res => {
if (res.code == 20000) {
if (res.data == null) {
@ -918,8 +987,8 @@ export default {
.catch(() => {
})
},
handleInvChange(invCode) {
this.invQuery.invCode = invCode
handleInvChange(deptCode) {
this.invQuery.deptCode = deptCode
getUsers(this.invQuery).then(res => {
if (res.code == 20000) {
this.users = res.data.list || []
@ -1006,9 +1075,12 @@ export default {
if (this.rowData.workplaceId == null) {
return this.$message.error('请先选择工位')
}
this.busName = 'add'
this.workplaceId = this.rowData.workplaceId
this.busData = this.rowData
this.userId = this.rowData.id
this.busTypeCodes = this.busTypeList.map(item => item.code)
this.upData = null
this.chooseBusTypeDialogVisible = true
},
onUserReset() {
@ -1162,6 +1234,13 @@ export default {
}).catch(() => {
})
},
updateBusType(row){
this.upData = row
this.busData = this.rowData
this.busName = 'edit'
this.chooseBusTypeDialogVisible = true
},
closeDialog() {
this.chooseBusTypeDialogVisible = false

@ -618,7 +618,6 @@ export default {
};
});
_this.options.findWorkPlace = getWorkPlace
console.log("djdjdjdjd",_this.options.findWorkPlace)
}
}).catch(() => {
_this.options.findWorkPlace = [];

Loading…
Cancel
Save