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

Merge remote-tracking branch 'origin/dev2.5_scan' into dev2.5_scan

Browse Source
dev2.5_scan
wangwei 3 months ago
parent e7c4ac0943 db7b82cb5a
commit fcc76a80cc
3 changed files with 122 additions and 75 deletions
Show Stats Download Patch File Download Diff File

1
src/api/collect/splitCreateOrder.js
Unescape Escape View File

@ -81,7 +81,6 @@ export function updateOrder(query) {
} }
export function checkCollectOrderManCode(query) { export function checkCollectOrderManCode(query) {
return axios({ return axios({
url: "/udiwms/basic/collect/IoCollectOrderCodeMan/checkCode", url: "/udiwms/basic/collect/IoCollectOrderCodeMan/checkCode",

187
src/views/basic/collectPoint/timerSetting.vue
Unescape Escape View File

@ -38,25 +38,25 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row :gutter="20">--> <!-- <el-row :gutter="20">-->
<el-col :span="20" class="el-col"> <el-col :span="20" class="el-col">
<el-form-item label="适用业务单据类型:" prop="autoDownloadKey" label-width="160px"> <el-form-item label="适用业务单据类型:" prop="autoDownloadKey" label-width="160px">
<el-select <el-select
v-model="formData.autoDownloadKey" v-model="formData.autoDownloadKey"
multiple multiple
placeholder="请选择适用业务单据类型" placeholder="请选择适用业务单据类型"
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
v-for="item in busTypeOptions" v-for="item in busTypeOptions"
:key="item.documentTypeCode" :key="item.documentTypeCode"
:label="item.busName" :label="item.busName"
:value="item.documentTypeCode" :value="item.documentTypeCode"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- </el-row>--> <!-- </el-row>-->
</el-collapse-item> </el-collapse-item>
<el-collapse-item name="1"> <el-collapse-item name="1">
<template slot="title"> <template slot="title">
@ -80,7 +80,7 @@
</template> </template>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8" class="el-col"> <el-col :span="8" class="el-col">
<el-form-item label="待处理单据自动分配:" prop="autoAllotOrder" > <el-form-item label="待处理单据自动分配:" prop="autoAllotOrder">
<el-radio-group v-model="formData.autoAllotOrder"> <el-radio-group v-model="formData.autoAllotOrder">
<el-radio :label="true">是</el-radio> <el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio> <el-radio :label="false">否</el-radio>
@ -88,7 +88,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="el-col"> <el-col :span="8" class="el-col">
<el-form-item label="单据自动完成:" prop="autoFinishOrder" > <el-form-item label="单据自动完成:" prop="autoFinishOrder">
<el-radio-group v-model="formData.autoFinishOrder"> <el-radio-group v-model="formData.autoFinishOrder">
<el-radio :label="true">是</el-radio> <el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio> <el-radio :label="false">否</el-radio>
@ -96,7 +96,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="el-col"> <el-col :span="8" class="el-col">
<el-form-item label="寄售预验收扫码校验:" prop="autoFinishOrder" > <el-form-item label="寄售预验收扫码校验:" prop="autoFinishOrder">
<el-radio-group v-model="formData.isScanCodeCheck"> <el-radio-group v-model="formData.isScanCodeCheck">
<el-radio :label="true">是</el-radio> <el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio> <el-radio :label="false">否</el-radio>
@ -104,25 +104,25 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row :gutter="20">--> <!-- <el-row :gutter="20">-->
<el-col :span="20" class="el-col"> <el-col :span="20" class="el-col">
<el-form-item label="适用业务单据类型:" prop="autoFinishOrderKey" label-width="160px"> <el-form-item label="适用业务单据类型:" prop="autoFinishOrderKey" label-width="160px">
<el-select <el-select
v-model="formData.autoFinishOrderKey" v-model="formData.autoFinishOrderKey"
multiple multiple
placeholder="请选择适用业务单据类型" placeholder="请选择适用业务单据类型"
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
v-for="item in busTypeOptions" v-for="item in busTypeOptions"
:key="item.documentTypeCode" :key="item.documentTypeCode"
:label="item.busName" :label="item.busName"
:value="item.documentTypeCode" :value="item.documentTypeCode"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- </el-row>--> <!-- </el-row>-->
</el-collapse-item> </el-collapse-item>
<el-collapse-item name="3"> <el-collapse-item name="3">
<template slot="title"> <template slot="title">
@ -161,25 +161,25 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row :gutter="20">--> <!-- <el-row :gutter="20">-->
<el-col :span="20" class="el-col"> <el-col :span="20" class="el-col">
<el-form-item label="适用业务单据类型:" prop="autoUploadOrderKey" label-width="160px"> <el-form-item label="适用业务单据类型:" prop="autoUploadOrderKey" label-width="160px">
<el-select <el-select
v-model="formData.autoUploadOrderKey" v-model="formData.autoUploadOrderKey"
multiple multiple
placeholder="请选择适用业务单据类型" placeholder="请选择适用业务单据类型"
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
v-for="item in busTypeOptions" v-for="item in busTypeOptions"
:key="item.documentTypeCode" :key="item.documentTypeCode"
:label="item.busName" :label="item.busName"
:value="item.documentTypeCode" :value="item.documentTypeCode"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- </el-row>--> <!-- </el-row>-->
</el-collapse-item> </el-collapse-item>
<el-collapse-item name="3"> <el-collapse-item name="3">
@ -229,8 +229,42 @@
<p class="form-title">扫码设置</p> <p class="form-title">扫码设置</p>
</template> </template>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8" class="el-col">
<el-form-item label="启用后置赋码:" prop="delayTageCode" >
<el-radio-group v-model="formData.delayTageCode">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8" class="el-col">
<el-form-item label="启用扫码冲突替换:" prop="conflictScan" >
<el-radio-group v-model="formData.conflictScan">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8" class="el-col">
<el-form-item label="启用退货冲突替换:" prop="conflictReturn" >
<el-radio-group v-model="formData.conflictReturn">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8" class="el-col"> <el-col :span="8" class="el-col">
<el-form-item label="网页扫码数量设置:" prop="scanMaxCount" style="margin-bottom: 0"> <el-form-item label="无码类型是否允许上货 :" prop="noCodeScan" >
<el-radio-group v-model="formData.noCodeScan">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8" class="el-col">
<el-form-item label="网页扫码数量设置:" prop="scanMaxCount" >
<el-input <el-input
style="width: 90%" style="width: 90%"
size="small" size="small"
@ -241,7 +275,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="el-col"> <el-col :span="8" class="el-col">
<el-form-item label="PAD扫码数量设置:" prop="pdaMaxCount" style="margin-bottom: 0"> <el-form-item label="PAD扫码数量设置:" prop="pdaMaxCount" >
<el-input <el-input
style="width: 90%" style="width: 90%"
size="small" size="small"
@ -252,7 +286,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="el-col"> <el-col :span="8" class="el-col">
<el-form-item label="工控扫码数量设置:" prop="ipcMaxCount" style="margin-bottom: 0"> <el-form-item label="工控扫码数量设置:" prop="ipcMaxCount" >
<el-input <el-input
style="width: 90%" style="width: 90%"
size="small" size="small"
@ -262,6 +296,8 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!--<el-row :gutter="20" style="margin-top: 20px">--> <!--<el-row :gutter="20" style="margin-top: 20px">-->
<!-- <el-col :span="8" class="el-col">--> <!-- <el-col :span="8" class="el-col">-->
@ -373,8 +409,7 @@ export default {
return { return {
num: 1, num: 1,
ShelfDisplayFlag: false, ShelfDisplayFlag: false,
busTypeOptions: [ busTypeOptions: [],
],
shelfData: [ shelfData: [
{ {
row: 1, row: 1,
@ -455,9 +490,14 @@ export default {
ipcMaxCount: null, ipcMaxCount: null,
autoDecode: 1, autoDecode: 1,
outputMode: 1, outputMode: 1,
autoDownloadKey:[], autoDownloadKey: [],
autoFinishOrderKey:[], autoFinishOrderKey: [],
autoUploadOrderKey:[] autoUploadOrderKey: [],
delayTageCode: null,
conflictScan: null,
conflictReturn: null,
noCodeScan: null,
}, },
systemParam: null, systemParam: null,
socket: null, socket: null,
@ -469,10 +509,10 @@ export default {
}, },
methods: { methods: {
getWorkBindBusTypes() { getWorkBindBusTypes() {
getWorkBindBusTypes({page:1,limit:500}).then(res => { getWorkBindBusTypes({page: 1, limit: 500}).then(res => {
if (res.code == 20000) { if (res.code == 20000) {
this.busTypeOptions = res.data.list || [] this.busTypeOptions = res.data.list || []
} }
}) })
}, },
handleInput() { handleInput() {
@ -521,7 +561,7 @@ export default {
.then((response) => { .then((response) => {
if (response.code != 20000) { if (response.code != 20000) {
this.$message.error(response.message); this.$message.error(response.message);
} else{ } else {
this.selectSysParam() this.selectSysParam()
this.$message.success("操作成功"); this.$message.success("操作成功");
} }
@ -630,5 +670,8 @@ export default {
padding-bottom: 17px; padding-bottom: 17px;
padding-top: 17px; padding-top: 17px;
} }
.el-col{
}
</style> </style>

9
src/views/collect/DealOrder.vue
Unescape Escape View File

@ -710,6 +710,7 @@ export default {
this.checkSuccess = true this.checkSuccess = true
this.filterQuery.code = this.scanCode.trim() this.filterQuery.code = this.scanCode.trim()
this.scanCode = '';
if (this.filterQuery.code.includes(';')) { if (this.filterQuery.code.includes(';')) {
const codeArray = this.filterQuery.code.split(';') const codeArray = this.filterQuery.code.split(';')
const verify = this.verifyScanCount(codeArray) const verify = this.verifyScanCount(codeArray)
@ -1055,7 +1056,11 @@ export default {
}) })
} else { } else {
loading.close(); loading.close();
this.$message.error(res.message) this.$alert(res.message, '提示', {
confirmButtonText: '确定',
callback: action => {
}
})
} }
}).catch(() => { }).catch(() => {
loading.close(); loading.close();
@ -1132,7 +1137,7 @@ export default {
}, },
startDeal() { startDeal() {
this.autoFinishOrderFlag = true this.autoFinishOrderFlag = false
this.curRow = this.formData this.curRow = this.formData
this.dealSplitOrder() this.dealSplitOrder()
//处理哪个活动的明细子组件 //处理哪个活动的明细子组件

Write Preview
Loading…
Cancel
Save