Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
anthonywj
8 months ago
commit
03db883f21
@ -0,0 +1,23 @@
|
||||
import axios from "@/utils/request";
|
||||
import request from "@/utils/request";
|
||||
|
||||
|
||||
//绑定单据类型
|
||||
export function bindBusType(query) {
|
||||
return axios({
|
||||
url: "/udiwms/sysWorkplace/workBindBusType",
|
||||
method: "post",
|
||||
data: query
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
export function getWorkBindBusTypes(query) {
|
||||
return axios({
|
||||
url: '/udiwms/sysWorkplace/getWorkBindBusTypes',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,271 @@
|
||||
<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">-->
|
||||
<!-- <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="10">
|
||||
<el-form-item label="编码/名称:" class="query-form-item">
|
||||
<el-input v-model="query.key" placeholder="请输入单据编号/单据名称" clearable>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
|
||||
|
||||
<div class="top-right-btn">
|
||||
<el-button-group>
|
||||
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
|
||||
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
|
||||
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="chooseBusType">选入</el-button>
|
||||
</el-button-group>
|
||||
</div>
|
||||
|
||||
|
||||
<el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"
|
||||
highlight-current-row @current-change="handCurrentChange" ref="table"
|
||||
>
|
||||
<el-table-column type="selection" width="55" :selectable="checkSelectable">
|
||||
</el-table-column>
|
||||
<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="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">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="text"-->
|
||||
<!-- size="small"-->
|
||||
<!-- @click.native.stop="editCollectionPoints(scope.row)"-->
|
||||
<!-- >编辑-->
|
||||
<!-- </el-button>-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="text"-->
|
||||
<!-- size="small"-->
|
||||
<!-- @click.native.stop="deleteCollectionPoints(scope.row)"-->
|
||||
<!-- >删除-->
|
||||
<!-- </el-button>-->
|
||||
<!-- </template>-->
|
||||
<!--</el-table-column>-->
|
||||
</el-table>
|
||||
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
getCollectBusType,
|
||||
addCollectBusType,
|
||||
updateCollectBusType,
|
||||
delCollectBusType, genCode
|
||||
} from '@/api/basic/collectPoint/gatherOrderType'
|
||||
import { getBusTypeList } from '@/api/basic/busType'
|
||||
import { bindBusType } from '@/api/basic/workPlace/sysWorkplaceManage'
|
||||
|
||||
export default {
|
||||
props: {
|
||||
closeDialog: {
|
||||
type: Function,
|
||||
required: true
|
||||
},
|
||||
workplaceId: {
|
||||
type: Object,
|
||||
required: true
|
||||
},
|
||||
busTypeCodes: {
|
||||
type: Array,
|
||||
required: true
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
query: {
|
||||
page: 1,
|
||||
limit: 10
|
||||
},
|
||||
showSearch: true,
|
||||
filterBadInv: true,
|
||||
loading: false,
|
||||
list: [],
|
||||
fromName: 'add',
|
||||
fromMap: {
|
||||
'add': '新增单据类型',
|
||||
'edit': '编辑单据类型'
|
||||
},
|
||||
addCollectionPointsDialogVisible: false,
|
||||
formData: {},
|
||||
code: '',
|
||||
total: 0,
|
||||
busTypes: [],
|
||||
formRules: {
|
||||
name: [
|
||||
{ required: true, message: '请输入单据类型名称', trigger: 'blur' }
|
||||
],
|
||||
fromType: [
|
||||
{ required: true, message: '请选择来源', trigger: 'blur' }
|
||||
],
|
||||
// invCode: [
|
||||
// { required: true, message: '请选择单据所属仓库', trigger: 'blur' }
|
||||
// ],
|
||||
mainAction: [
|
||||
{ required: true, message: '请选择出入库类型', trigger: 'blur' }
|
||||
],
|
||||
innerOrder: [
|
||||
{ required: true, message: '是否内部单据', trigger: 'blur' }
|
||||
]
|
||||
},
|
||||
mainActions: {
|
||||
WareHouseIn: '入库',
|
||||
WareHouseOut: '出库'
|
||||
},
|
||||
innerOrderMap: {
|
||||
0: '否',
|
||||
1: '是'
|
||||
},
|
||||
mainActionMap: {
|
||||
in: 'WareHouseIn',
|
||||
out: 'WareHouseOut'
|
||||
},
|
||||
|
||||
//新增数据
|
||||
rowList: [],
|
||||
BusTypeQuery: {
|
||||
workplaceCode: null,
|
||||
documentTypeCode: []
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
hideSearch() {
|
||||
this.showSearch = !this.showSearch
|
||||
},
|
||||
onReset() {
|
||||
this.$router.push({
|
||||
path: ''
|
||||
})
|
||||
this.query = {
|
||||
page: 1,
|
||||
limit: 10
|
||||
}
|
||||
this.getList()
|
||||
},
|
||||
onSubmit() {
|
||||
this.query.page = 1
|
||||
this.getList()
|
||||
},
|
||||
addCollectionPoints() {
|
||||
this.fromName = 'add'
|
||||
genCode().then(res => {
|
||||
if (res.code == 20000) {
|
||||
this.code = res.data
|
||||
this.formData = {
|
||||
code: res.data
|
||||
}
|
||||
this.addCollectionPointsDialogVisible = true
|
||||
}
|
||||
})
|
||||
},
|
||||
getList() {
|
||||
this.loading = true
|
||||
getCollectBusType(this.query).then((response) => {
|
||||
if (response.code == 20000) {
|
||||
this.list = response.data.list || []
|
||||
this.total = response.data.total || 0
|
||||
} else {
|
||||
this.$message.error(response.message)
|
||||
}
|
||||
this.loading = false
|
||||
})
|
||||
.catch(() => {
|
||||
this.loading = false
|
||||
this.list = []
|
||||
this.total = 0
|
||||
})
|
||||
},
|
||||
getBusType() {
|
||||
let query = {
|
||||
enabled: true,
|
||||
page: 1,
|
||||
limit: 10
|
||||
}
|
||||
getBusTypeList(query)
|
||||
.then((response) => {
|
||||
this.busTypes = response.data.list || []
|
||||
// this.filterQuery.action = this.busTypes[0].action;
|
||||
// this.getList();
|
||||
})
|
||||
.catch(() => {
|
||||
})
|
||||
},
|
||||
|
||||
//新增数据
|
||||
handCurrentChange(row) {
|
||||
this.rowList = row
|
||||
},
|
||||
//选入单据
|
||||
chooseBusType() {
|
||||
let selectList = this.$refs.table.selection
|
||||
let list = selectList.map(item => item.code)
|
||||
this.BusTypeQuery.workplaceCode = this.workplaceId
|
||||
this.BusTypeQuery.documentTypeCode = list
|
||||
if (list.length == 0) {
|
||||
return this.$message.error('未选择单据类型或该工位已没有可增加单据类型')
|
||||
}
|
||||
bindBusType(this.BusTypeQuery).then(res => {
|
||||
if (res.code == 20000) {
|
||||
this.$message.success('选入成功')
|
||||
this.closeDialog()
|
||||
} else {
|
||||
this.$message.error(res.message)
|
||||
}
|
||||
})
|
||||
},
|
||||
checkSelectable(row) {
|
||||
if (this.busTypeCodes == null) {
|
||||
return true
|
||||
} else {
|
||||
if (this.busTypeCodes.length > 0) {
|
||||
return this.busTypeCodes.indexOf(row.code) === -1
|
||||
} else {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
this.getBusType()
|
||||
}
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.dialog-footer {
|
||||
display: flex; /* 使用Flexbox布局 */
|
||||
justify-content: center; /* 水平居中 */
|
||||
align-items: center; /* 垂直居中 */
|
||||
}
|
||||
</style>
|
||||
@ -0,0 +1,145 @@
|
||||
<template>
|
||||
<div>
|
||||
<!-- 分割线 -->
|
||||
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" :inline="true" style="margin-top: 15px">
|
||||
<el-form-item prop="key" label="工位信息:">
|
||||
<el-input v-model="filterQuery.key" clearable placeholder="请输入或扫描工位二维码" style="width: 400px" ref="inputField" ></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item prop="key" label="往来单位:">
|
||||
<el-input v-model="filterQuery.key" clearable placeholder="请输入往来单位" style="width: 300px" ref="inputField" ></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button-group style="margin-left: 10px;display:flex;">
|
||||
<el-button type="primary" icon="el-icon-search" @click.native.stop="getList()">搜索</el-button>
|
||||
</el-button-group>
|
||||
</el-form-item>
|
||||
|
||||
</el-form>
|
||||
|
||||
|
||||
<el-row :gutter="8">
|
||||
<el-col v-for="(info, index) in list" :key="index" :xs="12" :sm="8" :md="8" :lg="6">
|
||||
<el-card :body-style="{margin:'20px'}"
|
||||
style="margin:20px 20px 20px 20px;height: 200px;background-color: #e1f3fb;border-radius: 12px; position: relative;"
|
||||
>
|
||||
<template #header>
|
||||
<el-form class="query-form" size="mini" style="height: 200px;" >
|
||||
<el-form-item class="query-form-item" label-width="28%" label="单据编号:">
|
||||
<el-input
|
||||
v-model="info.billNo"
|
||||
placeholder=""
|
||||
clearable
|
||||
class="custom-disabled-input"
|
||||
disabled
|
||||
style="width: 80%;"
|
||||
>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item class="query-form-item" label-width="28%" label="工位名称:">
|
||||
<el-input
|
||||
v-model="info.workplaceName"
|
||||
placeholder=""
|
||||
clearable
|
||||
style="width: 80%;"
|
||||
class="custom-disabled-input"
|
||||
disabled
|
||||
>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item class="query-form-item" label-width="28%" label="来源系统:">
|
||||
<el-input
|
||||
v-model="info.fromTypeName"
|
||||
placeholder=""
|
||||
clearable
|
||||
style="width: 80%;"
|
||||
class="custom-disabled-input"
|
||||
disabled
|
||||
>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label-width="28%" >
|
||||
<el-button-group style=" float: right;">
|
||||
<el-button type="primary" @click="handleClick(index)" style="margin-left: 10px ;"
|
||||
icon="el-icon-thumb"
|
||||
>开始处理
|
||||
</el-button>
|
||||
</el-button-group>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</template>
|
||||
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
|
||||
import QRCode from 'qrcodejs2'
|
||||
|
||||
export default {
|
||||
name: 'fieldOperation',
|
||||
data() {
|
||||
return {
|
||||
filterQuery:{
|
||||
key: '',
|
||||
tagStatus: 1,
|
||||
// invCode: this.$store.getters.locInvCode,
|
||||
page: 1,
|
||||
limit: 200
|
||||
},
|
||||
// 假设这是你的卡片数据
|
||||
list: [],
|
||||
total: 0,
|
||||
loading: false
|
||||
};
|
||||
},
|
||||
created() {
|
||||
//获取工位list
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
handleClick(index) {
|
||||
let url = window.location.origin + `#/tagCodeBlank?workplaceId=` + this.stationList[index].workplaceId
|
||||
// this.$router.push( workplaceId)
|
||||
window.open(url, '_blank');
|
||||
},
|
||||
getList() {
|
||||
this.loading = true;
|
||||
orderPage(this.filterQuery).then(res => {
|
||||
this.loading = false
|
||||
this.list = res.data.list || []
|
||||
this.total = res.data.total || 0
|
||||
}).catch(() => {
|
||||
this.loading = false
|
||||
this.list = []
|
||||
this.total = 0
|
||||
})
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style >
|
||||
|
||||
.custom-disabled-input input.el-input__inner:disabled {
|
||||
color: #000000; /* 修改为需要的颜色 */
|
||||
}
|
||||
/* 添加样式来定位左上角的删除按钮 */
|
||||
.close-button {
|
||||
position: absolute;
|
||||
top: 10px; /* 你可以根据需要调整这个值 */
|
||||
right: 10px; /* 你可以根据需要调整这个值 */
|
||||
z-index: 1; /* 确保按钮在卡片内容之上 */
|
||||
}
|
||||
|
||||
</style>
|
||||
Loading…
Reference in New Issue