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 f1bcc1a802
commit 9627ed7d73
3 changed files with 82 additions and 69 deletions
Show Stats Download Patch File Download Diff File

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

@ -55,11 +55,11 @@
</el-row>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="管理设备:" prop="documentTypeCode" class="query-form-item">
<el-select v-model="formData.inoutType" style="width: 80%" placeholder="请选择是否管理设备"
<el-form-item label="管理设备:" prop="autoTag" class="query-form-item">
<el-select v-model="formData.autoTag" style="width: 80%" placeholder="请选择是否管理设备"
>
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="2"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -215,7 +215,7 @@ 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 { getOriginBusType } from '@/api/thrsys/busOriginType'
import {getOriginBusType} from '@/api/thrsys/busOriginType'
export default {
props: {
@ -251,7 +251,8 @@ export default {
documentTypeCode: null,
orderCirType: 1,
warnType: 2,
workplaceType:3
workplaceType: 3,
autoTag: 0,
},
invList: [],
busTypes: [],
@ -278,7 +279,7 @@ export default {
{required: true, message: '请选择单据流通方式', trigger: 'blur'}
],
workplaceType: [
{ required: true, message: '请选择作业类型', trigger: 'blur' }
{required: true, message: '请选择作业类型', trigger: 'blur'}
]
// corpType: [
// // { required: true, message: '请选择往来单位类型', trigger: 'blur' }

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

@ -215,9 +215,9 @@
<span>{{ workplaceTypeMap[scope.row.workplaceType] }}</span>
</template>
</el-table-column>
<el-table-column label="管理设备" prop="inoutType" width="100">
<el-table-column label="管理设备" prop="autoTag" width="100">
<template slot-scope="scope">
<span>{{ inoutTypes[scope.row.inoutType] }}</span>
<span>{{ autoTagTypes[scope.row.autoTag] }}</span>
</template>
</el-table-column>
<el-table-column label="计量单位 " prop="orderCirType" width="100">
@ -660,17 +660,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: {
@ -721,31 +721,31 @@ 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' }
{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' }
@ -770,6 +770,10 @@ export default {
1: '是',
2: '否'
},
autoTagTypes: {
1: '是',
0: '否'
},
corpTypeMap: {
1: '客户',
2: '供应商',
@ -1034,7 +1038,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)

54
src/views/collect/CollectOrderAllotCardComponents.vue
Unescape Escape View File

@ -3,12 +3,12 @@
<el-card v-if="!changeViewDisabled">
<el-alert
style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"
:title="msgTip"
:closable="false"
type="warning">
</el-alert>
<!-- <el-alert-->
<!-- style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"-->
<!-- :title="msgTip"-->
<!-- :closable="false"-->
<!-- type="warning">-->
<!-- </el-alert>-->
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
@ -225,12 +225,12 @@
<el-card v-if="changeViewDisabled">
<el-alert
style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"
:title="msgTip"
:closable="false"
type="warning">
</el-alert>
<!-- <el-alert-->
<!-- style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"-->
<!-- :title="msgTip"-->
<!-- :closable="false"-->
<!-- type="warning">-->
<!-- </el-alert>-->
<div style="min-height: 400px;">
<!-- 分割线 -->
@ -394,7 +394,7 @@ import bindWorkDialog from "@/views/collect/bindWorkDialog";
import prescribeOriginPanel from "./PannelOrderBiz";
import prescribeOriginDiPanel from "./PannelOrderBiz";
import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage";
import {deleteByOrder, orderPage,orderTop} from "@/api/collect/collectOrder";
import {deleteByOrder, orderPage, orderTop} from "@/api/collect/collectOrder";
export default {
name: "prescribePanel",
@ -509,27 +509,36 @@ export default {
},
handleClick(index) {
// this.$router.push({ path: '/tagCodeBlank', query: { workplaceId: this.list[index].workPlaceCode , billNo: this.list[index].billNo }});
this.$router.push({ query: { ...this.$route.query, billNo: this.list[index].billNo }, path: this.$route.path })
let temp = this.list[index];
if (temp != null && temp.invAlert == 2) {
this.$message.warning("工位存量不足，请及时上货！");
return;
}
this.$router.push({query: {...this.$route.query, billNo: this.list[index].billNo}, path: this.$route.path})
this.callParentMethod(index)
},
callParentMethod(index) {
let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + this.list[index].workPlaceCode + "&billNo=" + this.list[index].billNo
// 触发自定义事件 'parent-method'
this.$emit('parent-method', "DealOrder",url); // someData 是你想要传递给父组件的数据
this.$emit('parent-method', "DealOrder", url); // someData 是你想要传递给父组件的数据
},
linkPage(_this, row) {
if (row != null && row.invAlert == 2) {
_this.$message.warning("工位存量不足，请及时上货！");
return;
}
let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo
window.open(url, '_blank');
},
//置顶
orderTop(_this, row) {
let data = row;
orderTop({id:data.id}).then(res => {
if (res.code == 20000){
orderTop({id: data.id}).then(res => {
if (res.code == 20000) {
_this.$message.success("置顶成功")
_this.getList()
}else {
} else {
_this.$message.error(res.message)
_this.getList()
}
@ -608,7 +617,7 @@ export default {
this.loading = false
this.list = res.data.list || []
this.total = res.data.total || 0
if (this.filterQuery.workPlaceCode != null){
if (this.filterQuery.workPlaceCode != null) {
this.changeInvRemind(this.filterQuery.workPlaceCode)
}
@ -685,7 +694,7 @@ export default {
.then((response) => {
_this.loading = false;
_this.options.findWorkPlace = response.data || [];
if (_this.options.findWorkPlace .length == 1){
if (_this.options.findWorkPlace.length == 1) {
_this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code;
}
})
@ -696,7 +705,6 @@ export default {
},
},
created() {
if (this.$route.query.workplaceId != null) {
@ -704,7 +712,7 @@ export default {
this.filterQuery.workPlaceCode = this.$route.query.workplaceId
this.showType = 2
}
this.findWorkPlace(this,"");
this.findWorkPlace(this, "");
getHead("prescribeAllot", "1").then((re) => {
// 处理返回的数据
this.tableObj = re.data;

Write Preview
Loading…
Cancel
Save