bug修改

20240912_adapter_z
yewj 10 months ago
parent b2207905b7
commit 593ee4065d

@ -26,7 +26,6 @@ export function getCodeList(query) {
} }
export function destroyOut(query) { export function destroyOut(query) {
return axios({ return axios({
url: "/udiwms/collect/fifo/desOrder/destroyOut", url: "/udiwms/collect/fifo/desOrder/destroyOut",

@ -217,7 +217,7 @@
:total="total" :total="total"
:limit.sync="filterQuery.limit" :limit.sync="filterQuery.limit"
:page.sync="filterQuery.page" :page.sync="filterQuery.page"
:page-sizes="[12, 24, 48]" :page-sizes="[9, 18, 36]"
@pagination="handleCurrentChange" @pagination="handleCurrentChange"
></pagination> ></pagination>
</el-card> </el-card>
@ -420,7 +420,7 @@ export default {
return { return {
msgTip: "库存预警提醒:", msgTip: "库存预警提醒:",
isLinkDisabled: false, isLinkDisabled: false,
changeViewDisabled: true, changeViewDisabled: false,
userInfo: { userInfo: {
inv: this.$store.getters.locInvName, inv: this.$store.getters.locInvName,
deptName: this.$store.getters.locDeptName, deptName: this.$store.getters.locDeptName,
@ -452,7 +452,7 @@ export default {
workPlaceCode: null, workPlaceCode: null,
tagStatus: null, tagStatus: null,
page: 1, page: 1,
limit: 12, limit: 9,
}, },
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
loading: false, loading: false,
@ -591,7 +591,7 @@ export default {
billNo: null, billNo: null,
tagStatus: null, tagStatus: null,
page: 1, page: 1,
limit: 12, limit: 9,
}; };
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();

@ -87,18 +87,7 @@
<i class="el-icon-edit-outline"></i> <i class="el-icon-edit-outline"></i>
<span slot="title">处理单据</span> <span slot="title">处理单据</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=1 @click="clickMenuItem(1)">
<i class="el-icon-s-unfold"></i>
<span slot="title">工位上货</span>
</el-menu-item>
<el-menu-item :index=2 @click="clickMenuItem(2)">
<i class="el-icon-s-fold"></i>
<span slot="title">工位退货</span>
</el-menu-item>
<el-menu-item :index=3 @click="clickMenuItem(3)">
<i class="el-icon-s-platform"></i>
<span slot="title">工位存量</span>
</el-menu-item>
<el-menu-item :index=4 @click="clickMenuItem(4)"> <el-menu-item :index=4 @click="clickMenuItem(4)">
<i class="el-icon-s-order"></i> <i class="el-icon-s-order"></i>
<span slot="title">待处理单</span> <span slot="title">待处理单</span>
@ -111,6 +100,18 @@
<i class="el-icon-s-claim"></i> <i class="el-icon-s-claim"></i>
<span slot="title">单据上传</span> <span slot="title">单据上传</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=1 @click="clickMenuItem(1)">
<i class="el-icon-s-unfold"></i>
<span slot="title">工位上货</span>
</el-menu-item>
<el-menu-item :index=2 @click="clickMenuItem(2)">
<i class="el-icon-s-fold"></i>
<span slot="title">工位退货</span>
</el-menu-item>
<el-menu-item :index=3 @click="clickMenuItem(3)">
<i class="el-icon-s-platform"></i>
<span slot="title">工位存量</span>
</el-menu-item>
<el-menu-item :index=7 @click="clickMenuItem(7)"> <el-menu-item :index=7 @click="clickMenuItem(7)">
<i class="el-icon-s-claim"></i> <i class="el-icon-s-claim"></i>
<span slot="title">损耗出库</span> <span slot="title">损耗出库</span>

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<el-form :model="formData" class="order-el-form" ref="formData" label-width="120px"> <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px" @submit.native.prevent>
<el-card> <el-card>
<!-- <el-alert--> <!-- <el-alert-->

@ -26,12 +26,12 @@
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<!--<el-alert--> <!-- <el-alert-->
<!-- style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"--> <!-- style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"-->
<!-- :title="msgTip"--> <!-- :title="msgTip"-->
<!-- :closable="false"--> <!-- :closable="false"-->
<!-- type="warning">--> <!-- type="warning">-->
<!--</el-alert>--> <!-- </el-alert>-->
<el-row> <el-row>
@ -131,31 +131,31 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:" v-if="!corpOrderIdDisabled"> <!-- <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:" v-if="!corpOrderIdDisabled">-->
<el-select <!-- <el-select-->
v-model="orderFormData.workPlaceCode" <!-- v-model="orderFormData.workPlaceCode"-->
placeholder="当前工位" <!-- placeholder="当前工位"-->
style="width: 90%" <!-- style="width: 90%"-->
:disabled="corpOrderIdDisabled" <!-- :disabled="corpOrderIdDisabled"-->
filterable <!-- filterable-->
@change="changeInvRemind" <!-- @change="changeInvRemind"-->
> <!-- >-->
<el-option <!-- <el-option-->
v-for="item in curWorkPlaces" <!-- v-for="item in curWorkPlaces"-->
:key="item.workplaceId" <!-- :key="item.workplaceId"-->
:label="item.workplaceName" <!-- :label="item.workplaceName"-->
:value="item.workplaceId" <!-- :value="item.workplaceId"-->
> <!-- >-->
<span style="float: left">{{ item.workplaceName }}</span> <!-- <span style="float: left">{{ item.workplaceName }}</span>-->
<span style="float: right; color: #8492a6; font-size: 13px">{{ <!-- <span style="float: right; color: #8492a6; font-size: 13px">{{-->
item.workplaceId <!-- item.workplaceId-->
}}</span> <!-- }}</span>-->
</el-option> <!-- </el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="8" v-if="splitType=='out'"> <el-col :span="8" v-if="splitType=='out'">
<el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:"> <el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:">
<el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable" @change="splitChange"> <el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable" @change="splitChange">
@ -531,7 +531,7 @@ export default {
isSuccess: false, isSuccess: false,
result: "", result: "",
scanResultType: "success", scanResultType: "success",
msgTip: "当前上货产品的总量", msgTip: "当前工位存量提醒",
splitType: null, splitType: null,
rowData: {}, rowData: {},
curWorkPlace: null, curWorkPlace: null,

Loading…
Cancel
Save