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

选择往来单位仓库修改

Browse Source
20240912_adapter_z
yewj 7 months ago
parent d377f0d486
commit f93a1a7b66
4 changed files with 88 additions and 68 deletions
Show Stats Download Patch File Download Diff File

12
src/api/collect/collectOrder.js
Unescape Escape View File

@ -188,4 +188,14 @@ export function errorHandle(query) {
method: "post",
data: query
});
}
}
export function findFromCorp(query) {
return axios({
url: "/udiwms/basic/collect/fromCorp",
method: "post",
data: query
});
}

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

@ -83,6 +83,14 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="顺序号:" prop="number" class="query-form-item">
<el-input-number :min="0" v-model="formData.number" style="width: 80%"
placeholder="顺序号"
></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-divider></el-divider>
@ -109,17 +117,17 @@
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="el-col">-->
<!-- <el-form-item label="单据完成条件:" prop="monopoly" class="query-form-item">-->
<!-- <el-select v-model="formData.orderFinishVerify" style="width: 80%" placeholder="单据完成条件"-->
<!-- :disabled="formData.scanType == 1"-->
<!-- >-->
<!-- <el-option label="完全赋码" :value="0"></el-option>-->
<!-- <el-option label="部分赋码" :value="1"></el-option>-->
<!-- &lt;!&ndash; <el-option label="赋码超出" :value="2"></el-option>&ndash;&gt;-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="el-col">-->
<!-- <el-form-item label="单据完成条件:" prop="monopoly" class="query-form-item">-->
<!-- <el-select v-model="formData.orderFinishVerify" style="width: 80%" placeholder="单据完成条件"-->
<!-- :disabled="formData.scanType == 1"-->
<!-- >-->
<!-- <el-option label="完全赋码" :value="0"></el-option>-->
<!-- <el-option label="部分赋码" :value="1"></el-option>-->
<!-- &lt;!&ndash; <el-option label="赋码超出" :value="2"></el-option>&ndash;&gt;-->
<!-- </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="结果处理"
@ -132,30 +140,30 @@
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="el-col">-->
<!-- <el-form-item label="三期不一致:" prop="checkBatchInsert" class="query-form-item">-->
<!-- <el-select v-model="formData.checkBatchInsert" style="width: 80%" placeholder="结果处理"-->
<!-- :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="checkBatchInsert" class="query-form-item">-->
<!-- <el-select v-model="formData.checkBatchInsert" style="width: 80%" placeholder="结果处理"-->
<!-- :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="overCount" class="query-form-item">-->
<!-- <el-select v-model="formData.overCount" style="width: 80%" placeholder="是否允许数量溢出"-->
<!-- :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-col :span="12" class="el-col">-->
<!-- <el-form-item label="数量溢出:" prop="overCount" class="query-form-item">-->
<!-- <el-select v-model="formData.overCount" style="width: 80%" placeholder="是否允许数量溢出"-->
<!-- :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="请选择异常提醒方式">-->
<!-- <el-option label="信息提醒" :value="1"></el-option>-->
@ -301,7 +309,8 @@ export default {
isPopular: 1,
invCode: '',
overCount: 1,
checkBatchInsert:2,
checkBatchInsert: 2,
number: 1,
},
invList: [],
busTypes: [],

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

@ -155,12 +155,12 @@
</el-table-column>
</el-table>
<pagination
:total="total"
:limit.sync="query.limit"
:page.sync="query.page"
@pagination="getList"
>
</pagination>
:total="total"
:limit.sync="query.limit"
:page.sync="query.page"
@pagination="getList"
>
</pagination>
</el-card>
<!--<el-card>-->
<el-tabs type="border-card" style="margin: 15px">
@ -210,14 +210,14 @@
</template>
</el-table-column>
<el-table-column label="单据类型" prop="thrBusName" width="100"></el-table-column>
<!-- <el-table-column label="单据完成条件" prop="orderFinishVerify" width="100">-->
<!-- <el-table-column label="单据完成条件" prop="orderFinishVerify" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ orderFinishVerifys[scope.row.orderFinishVerify] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="队列管理" prop="autoTag" width="100">
<template slot-scope="scope">
<span>{{ autoTagTypes[scope.row.autoTag] }}</span>9
<span>{{ autoTagTypes[scope.row.autoTag] }}</span>
</template>
</el-table-column>
<el-table-column label="独占库存" prop="monopoly" width="90">
@ -240,11 +240,11 @@
<span>{{ checkInserts[scope.row.checkInsert] }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="异常方式提醒" prop="warnType" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ warnTypeMap[scope.row.warnType] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="异常方式提醒" prop="warnType" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ warnTypeMap[scope.row.warnType] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="是否常用" prop="isPopular" width="100">
<template slot-scope="scope">
@ -672,17 +672,17 @@ import {
deleteWorkplace,
createWorkplaceId, printWorkLabel, getUsers
} from '@/api/basic/workPlace/sysWorkplaceManage'
import { filterAllByUser, filterList, getInvListByUser } from '@/api/system/invWarehouse'
import { addTree, deleteTree, getTree, updateTree } from '@/api/basic/collectPoint/collectPointManage'
import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType'
import {filterAllByUser, filterList, 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: {
@ -733,31 +733,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' }
@ -1063,7 +1063,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)

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

@ -130,9 +130,9 @@
placeholder="请选择往来单位" clearable style="width: 90%">
<el-option
v-for="item in fromInvOptions"
:key="item.erpId"
:key="item.code"
:label="item.name"
:value="item.erpId"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
@ -350,7 +350,7 @@ import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
import {enterCodeWeb} from "@/api/inout/order";
import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder";
import {selectCorpList} from "@/api/basic/basicUnitMaintain";
import {getCurOrder, getNextOrder, findByBill} from "@/api/collect/collectOrder";
import {getCurOrder, getNextOrder, findByBill, findFromCorp} from "@/api/collect/collectOrder";
import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
import {getInvListByUser} from "@/api/system/invWarehouse";
@ -523,8 +523,9 @@ export default {
findFromInvList(val) {
let cQuery = {
corpType: this.formDataVisible.corpType,
invCode: this.formData.invCode
};
selectCorpList(cQuery)
findFromCorp(cQuery)
.then((response) => {
this.fromInvOptions = response.data || [];
})

Write Preview
Loading…
Cancel
Save