CTP 2 years ago
commit 449c751f9b

@ -7,6 +7,8 @@ ENV = 'development'
# 若依管理系统/开发环境
VUE_APP_BASE_API = '/dev-api'
VUE_APP_SYNC_API ="http://127.0.0.1:10001"
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/'

@ -2,9 +2,6 @@
VUE_APP_TITLE = UDI管理系统
# 生产环境配置
ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
@ -13,13 +10,19 @@ ENV = 'production'
#林纪裕cd
# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
# VUE_APP_SYNC_API ="http://r.jiyuudims.cloud:5008/SP_SYNC_SERVER"
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
# 测试服务器
# VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
# 文明东
# 文明东1
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
# 文明东2
# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
# VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
VUE_APP_SYNC_API ="http://55.55.0.24:9150/SP_SYNC_SERVER"
# 吴总测试服务器
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'

@ -9,19 +9,19 @@ ENV = 'test'
#林纪裕cd
# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
#VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
# 测试服务器
# VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
# 文明东
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
# 吴总测试服务器
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://192.168.0.66:8883/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.66:8883/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

@ -16,6 +16,14 @@ export function bindInvSpace(data) {
});
}
export function unbindInvOrderSpace(data) {
return axios({
url: "/spms/inv/product/unbindInvOrderSpace",
method: "post",
data: data
});
}
export function bindInvOrderSpace(data) {
return axios({
url: "/spms/inv/product/bindInvOrderSpace",
@ -40,6 +48,14 @@ export function getInvProductInfo(params) {
});
}
export function getInvProductOutInfo(params) {
return axios({
url: "/spms/inv/product/getInvProductOutInfo",
method: "get",
params: params
});
}
export function getCheckInvProductInfo(params) {
return axios({
url: "/spms/inv/product/getCheckInvProductInfo",

@ -15,3 +15,11 @@ export function getInvPlaceOrderDetailList(params) {
params: params
});
}
export function selectPlaceList(params) {
return axios({
url: "/spms/inv/product/selectPlaceList",
method: "get",
params: params
});
}

@ -159,7 +159,8 @@ export default {
page: 1,
limit: 20,
addType: 1,
diType: 1
diType: 1,
bindType: 1
};
this.getList();
},

@ -39,7 +39,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="name">
<el-input v-model="inputQuery.batchNo" auto-complete="off" :disabled="true" ></el-input>
<el-input v-model="inputQuery.batchNo" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
@ -50,7 +50,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="code">
<el-input v-model="inputQuery.price" auto-complete="off" :disabled="true"></el-input>
<el-input v-model="inputQuery.price" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -62,7 +62,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="name">
<el-input v-model="inputQuery.manufacturer" auto-complete="off" :disabled="true" ></el-input>
<el-input v-model="inputQuery.manufacturer" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
@ -73,7 +73,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="code">
<el-input v-model="inputQuery.certCode" auto-complete="off" :disabled="true" ></el-input>
<el-input v-model="inputQuery.certCode" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
@ -83,7 +83,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="code">
<el-input v-model="inputQuery.productDate" auto-complete="off" :disabled="true" ></el-input>
<el-input v-model="inputQuery.productDate" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
@ -93,7 +93,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="code">
<el-input v-model="inputQuery.measname" auto-complete="off" :disabled="true"></el-input>
<el-input v-model="inputQuery.measname" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
@ -123,7 +123,6 @@
</el-row>
<el-row>
<el-col :span="3">
<div class="ao-text">
@ -164,10 +163,11 @@
</el-col>
<el-col :span="8">
<el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.filePath!=null"
style="text-align:right" @click="showImgViewer" >
检验报告预览
style="text-align:right" @click="showImgViewer">
检验报告预览
</el-button>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"
:url-list="imgList"/>
</el-col>
@ -183,11 +183,10 @@ import draggable from "vuedraggable";
import store from "@/store";
import {updateById} from '@/api/inout/orderDetailBiz'
import {updateOrderDetailBiz} from '@/api/inout/order'
import { previewImage } from '@/api/purchase/supCompany'
import {previewImage} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
export default {
name: "DialogCheck",
props: {
@ -208,19 +207,20 @@ export default {
},
data() {
return {
imgList:[],
imgViewerVisible:false,
imgList: [],
imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API,
IMAGE_URL: process.env.VUE_APP_SYNC_API,
code: "",
formData: {
ggxh:"",
cpmctymc:"",
machineNo:"",
invoiceCode:"",
invoiceEncode:"",
price:"",
remark:"",
licenseUrl:""
ggxh: "",
cpmctymc: "",
machineNo: "",
invoiceCode: "",
invoiceEncode: "",
price: "",
remark: "",
licenseUrl: ""
},
// formRules: {
// name: [
@ -239,20 +239,20 @@ export default {
};
},
components: {
draggable,ElImageViewer
draggable, ElImageViewer
},
methods: {
submitUpload() {
updateById(this.inputQuery).then((res) =>{
if(res.code==20000){
this.$message({
type: "success",
message: "修改成功!",
});
this.closeDialog();
}
updateById(this.inputQuery).then((res) => {
if (res.code == 20000) {
this.$message({
type: "success",
message: "修改成功!",
});
this.closeDialog();
}
} )
})
},
@ -299,8 +299,8 @@ export default {
//
// },
uploadHandleRemove(file, fileList) {
this.inputQuery.filePath=null;
this.inputQuery.checkFileName=null;
this.inputQuery.filePath = null;
this.inputQuery.checkFileName = null;
console.log(file, fileList);
},
uploadHandlePreview(file) {
@ -311,7 +311,7 @@ export default {
this.$message.warning(`当前限制选择 1 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
},
uploadOnchange(file, fileList) {
this.inputQuery.checkFileName=file.name;
this.inputQuery.checkFileName = file.name;
let fileName = file.name;
let uid = file.uid
let pos = fileName.lastIndexOf(".");
@ -340,7 +340,7 @@ export default {
uploadHandleSuccess(response, file, fileList) {
if (response.code === 20000) {
this.inputQuery.filePath = response.data.name;
// this.onSubmit();
// this.onSubmit();
} else {
this.$message.error("文件上传失败:" + response.message);
}
@ -349,24 +349,28 @@ export default {
},
showImgViewer(row){
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList=[];
previewImage({imageUrl:this.inputQuery.filePath,certFileUrl:this.certFileUrl}).then(response => {
showImgViewer(row) {
this.certFileUrl = this.IMAGE_URL + "/mapi" + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
previewImage({imageUrl: this.inputQuery.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList=response.data;
this.imgList = response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); //
},
closeImgViewer(){
closeImgViewer() {
this.imgViewerVisible = false;
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},

@ -166,7 +166,7 @@
row-key="id"
highlight-current-row
>
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="发票编码"
@ -236,7 +236,7 @@
:total="codeTotal"
:page.sync="codeQuery.page"
:limit.sync="codeQuery.limit"
@pagination="getOrderDetail"
@pagination="getCodeDetailLists"
/>
</el-tab-pane>
</el-tabs>
@ -264,7 +264,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
import DialogInvoice from "@/views/inout/DialogInvoice";
import InvoiceRegister from "@/views/inout/InvoiceRegister";
import { previewImage } from "@/api/purchase/supCompany";
import {previewImage} from "@/api/purchase/supCompany";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import store from "@/store";
@ -318,6 +318,7 @@ export default {
imgList: [],
imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API,
IMAGE_URL: process.env.VUE_APP_SYNC_API,
showSearch: true,
filterQuery: {
id: "",
@ -341,16 +342,16 @@ export default {
},
formRules: {
machineNo: [
{ required: true, message: "请输入机械编码", trigger: "blur" },
{required: true, message: "请输入机械编码", trigger: "blur"},
],
invoiceCode: [
{ required: true, message: "请输入发票代码", trigger: "blur" },
{required: true, message: "请输入发票代码", trigger: "blur"},
],
invoiceEncode: [
{ required: true, message: "请输入发票编码", trigger: "blur" },
{required: true, message: "请输入发票编码", trigger: "blur"},
],
price: [{ required: true, message: "请输入发票价格", trigger: "blur" }],
invoiceDate: [{ required: true, message: "请输入日期", trigger: "blur" }],
price: [{required: true, message: "请输入发票价格", trigger: "blur"}],
invoiceDate: [{required: true, message: "请输入日期", trigger: "blur"}],
},
certFileUrl: "",
Upinvoice: false,
@ -471,7 +472,7 @@ export default {
subRow: null,
};
},
components: { AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer },
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
methods: {
onSubmit() {
if (this.invoiceRow == null) {
@ -517,7 +518,8 @@ export default {
});
},
uploadHandleError() {},
uploadHandleError() {
},
uploadHandleSuccess(response, file, fileList) {
debugger;
if (response.code === 20000) {
@ -646,11 +648,12 @@ export default {
.then((res) => {
this.closeDialog();
})
.catch((error) => {});
.catch((error) => {
});
},
showImgViewer(row) {
this.certFileUrl =
this.BASE_URL +
this.IMAGE_URL + "/mapi" +
"/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
previewImage({

@ -196,7 +196,9 @@
</el-table-column>
<el-table-column label="操作" width="180" fixed="right">
<template slot-scope="scope">
<el-button type="text" :disabled="scope.row.checkStatus==1" size="small" @click.native.stop="determine(scope.row)">确认</el-button>
<el-button type="text" :disabled="scope.row.checkStatus==1" size="small"
@click.native.stop="determine(scope.row)">确认
</el-button>
<!--<el-button-->
<!-- type="text"-->
<!-- size="small"-->
@ -225,7 +227,7 @@
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
<el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
<el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
@row-click="BizDetail"
row-key="id" highlight-current-row
>
@ -325,7 +327,7 @@
:total="codeTotal"
:page.sync="codeQuery.page"
:limit.sync="codeQuery.limit"
@pagination="getOrderDetails"
@pagination="getCodeDetailList"
/>
</el-tab-pane>
@ -337,11 +339,14 @@
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-发票信息</span>
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="发票编码" width="150"
prop="invoiceEncode"
></el-table-column>
<el-table-column
label="物资名称"
prop="cpmctymc" width="150"
@ -366,10 +371,7 @@
label="发票代码" width="150"
prop="invoiceCode"
></el-table-column>
<el-table-column
label="发票编码" width="150"
prop="invoiceEncode"
></el-table-column>
<el-table-column
label="开票日期" width="150"
prop="invoiceDate"
@ -462,9 +464,6 @@
</el-dialog>
<el-dialog
:title="formMap[formName]"
:visible.sync="InvoiceRegisterv"
@ -514,7 +513,7 @@
<script>
import {
deleteByOrderId,
getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder,filterOrderList
getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder, filterOrderList
} from '../../api/inout/order'
import {getLocalJoinByUser} from "@/api/basic/busType";
import {getInvListByUser} from "@/api/system/invWarehouse";
@ -552,13 +551,14 @@ export default {
name: "IoCheckSuccessOrder",
data() {
return {
savebillno:null,
invoiceRow:[],
inputInv:[],
checkInvoice:false,
savebillno: null,
invoiceRow: [],
inputInv: [],
checkInvoice: false,
imgList: [],
imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API,
IMAGE_URL: process.env.VUE_APP_SYNC_API,
showSearch: true,
filterQuery: {
id: "",
@ -572,17 +572,17 @@ export default {
endTime: null,
invCode: this.$store.getters.locInvCode,
},
Refresh:{
id:"",
orderIdFk:null,
bizIdFk:"",
Refresh: {
id: "",
orderIdFk: null,
bizIdFk: "",
},
determineVisible: false,
determineData:null,
determineData: null,
corpLoading: false,
fromOptions: [],
regId:null,
par:[],
regId: null,
par: [],
formName: 1,
formMap: {
@ -711,7 +711,7 @@ export default {
subRow: null,
};
},
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer,InvoiceRegistrationDetermine,checkInvoice},
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice},
methods: {
// upData(data){
// this.invoiceRow = data;
@ -732,21 +732,21 @@ export default {
endTime: null,
invCode: this.$store.getters.locInvCode,
};
this.actDateRange=[];
this.auditDateRange=[];
this.actDateRange = [];
this.auditDateRange = [];
this.getList();
},
InvoiceRegister1(row){
this.savebillno=row.billNo
this.inputInv=row;
this.checkInvoice=true;
InvoiceRegister1(row) {
this.savebillno = row.billNo
this.inputInv = row;
this.checkInvoice = true;
},
closecheckInvoice(){
this.checkInvoice=false;
closecheckInvoice() {
this.checkInvoice = false;
this.getList();
this.currentRow.billNo=this.savebillno;
this.bizQuery.orderIdFk=this.savebillno;
this.codeQuery.orderIdFk=this.savebillno;
this.currentRow.billNo = this.savebillno;
this.bizQuery.orderIdFk = this.savebillno;
this.codeQuery.orderIdFk = this.savebillno;
this.getCodeDetailList();
this.getBizDetailListInv();
@ -777,7 +777,7 @@ export default {
this.showSearch = !this.showSearch;
},
showImgViewer(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.certFileUrl = this.IMAGE_URL + "/mapi" + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
previewImage({imageUrl: row.licenseUrl, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
@ -836,8 +836,8 @@ export default {
type: "warning",
})
.then(() => {
this.par=row;
this.par.regId=this.regId;
this.par = row;
this.par.regId = this.regId;
deleteById(row)
.then((response) => {
if (response.code == 20000) {
@ -1039,11 +1039,11 @@ export default {
return;
}
this.bizDetailLoading = true;
if(row != null) {
this.bizQuery.orderIdFk=row.orderIdFk;
if (row != null) {
this.bizQuery.orderIdFk = row.orderIdFk;
this.bizQuery.batchNo = row.batchNo;
this.bizQuery.relId = row.bindRlFk;
// this.bizQuery.bizIdFk = row.id;
// this.bizQuery.bizIdFk = row.id;
}
filterListInvoice(this.bizQuery).then((res) => {
this.bizDetailLoading = false;
@ -1065,14 +1065,14 @@ export default {
BizDetail(row) {
this.regId=row.id;
this.regId = row.id;
this.bizQuery.page = 1;
this.subRow = row;
this.getBizDetailListInv(row);
},
determine(row){
this.determineData=row;
this.determineVisible=true;
determine(row) {
this.determineData = row;
this.determineVisible = true;
},
//
@ -1134,9 +1134,9 @@ export default {
return statusMap[status];
},
getNewInv (row){
this.Refresh.orderIdFk=row.billNo;
addBizProduct(this.Refresh).then( (res) => {
getNewInv(row) {
this.Refresh.orderIdFk = row.billNo;
addBizProduct(this.Refresh).then((res) => {
if (res.code === 20000) {
this.$message.success("刷新成功!");
this.getList();

@ -440,33 +440,34 @@ export default {
}
},
deleteCodeArray(index, row) {
let _this = this
this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
if (this.orderEditor) {
this.detailLoading = true;
if (this.$isNotBlank(row.id)) {
if (_this.formData.billNo) {
_this.detailLoading = true;
if (_this.$isNotBlank(row.id)) {
delReceiveDetail({id: row.id})
.then(response => {
this.detailLoading = false;
_this.detailLoading = false;
if (response.code === 20000) {
this.getOrderDetailList();
_this.getOrderDetailList();
} else {
this.$message.error(response.message);
_this.$message.error(response.message);
}
})
.catch(() => {
this.detailLoading = false;
_this.detailLoading = false;
})
} else {
this.$message.success('删除成功');
this.codeArray.splice(index, 1);
_this.$message.success('删除成功');
_this.codeArray.splice(index, 1);
}
} else {
this.$message.success('删除成功');
this.codeArray.splice(index, 1);
_this.$message.success('删除成功');
_this.codeArray.splice(index, 1);
}
}).catch(() => {

@ -0,0 +1,318 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="18">
<el-form-item class="query-form-item" label="UDI码:">
<el-input v-model="filterQuery.code"
placeholder="请扫描或输入UDI码"
ref="inputRef"
clearable
style="width: 97%"
@keyup.enter.native="keyup_submit($event)"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
@change="invChange"
style="width: 90%"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="货位:">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
@change="getList"
style="width: 90%"
>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="上架方式:">-->
<!-- <el-select v-model="filterQuery.type" placeholder="请选择上架方式" clearable="true"-->
<!-- @change="typeChange"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option :value="1" label="按物资上架"></el-option>-->
<!-- <el-option :value="2" label="按单上架"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.orderId" :disabled="filterQuery.type !== 2" placeholder="请输入单号"
clearable style="width: 90%"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="产品名称:">
<el-input v-model="filterQuery.productName" placeholder="请输入产品名称" clearable
style="width: 90%"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="产品标识:">
<el-input v-model="filterQuery.nameCode" placeholder="请输入产品标识" clearable
style="width: 90%"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="请输入批次号" clearable
style="width: 90%"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="注册备案号:">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="请输入注册备案号" clearable
style="width: 90%"></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-box" @click="invPlace(3)"></el-button>
</el-button-group>
</div>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="记录号" prop="recordId" width="180"></el-table-column>
<el-table-column label="仓库" prop="invName" width="180"></el-table-column>
<el-table-column label="操作时间" prop="createTime" width="150"></el-table-column>
<el-table-column label="操作前货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="操作后货位" prop="invSpaceName" width="180"></el-table-column>
<!-- <el-table-column label="操作人" prop="operatorName" width="120"></el-table-column>-->
<!-- <el-table-column label="上架方式" prop="type" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag>{{ typeNames[scope.row.type] }}</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="单号" v-if="filterQuery.type === 2" prop="orderId" width="120"></el-table-column>
<!-- <el-table-column label="产品标识" prop="nameCode" width="150"></el-table-column>-->
<el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="数量" prop="count" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="计量单位" prop="expireDate" width="120"></el-table-column>
<el-table-column label="注册备案号" prop="zczbhhzbapzbh" show-overflow-tooltip
width="200"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip
width="200"></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip
width="200"></el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="getList"
></pagination>
</el-card>
<el-dialog
title="货位变更"
:visible.sync="placeChangeDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="placeChangeDialogVisible"
>
<InvPlaceChangeModify
:closePlaceDialog="closePlaceDialog"
></InvPlaceChangeModify>
</el-dialog>
</div>
</template>
<script>
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import {getInvPlaceOrderList, getInvPlaceOrderDetailList} from "@/api/inventory/invPlaceOrder";
import {isBlank} from "@/utils/strUtil";
import invProductPlaceModify from "@/views/inventory/InvProductPlaceModify.vue";
import invOrderPlaceModify from "@/views/inventory/InvOrderPlaceModify.vue";
import InvPlaceChangeModify from "@/views/inventory/InvPlaceChangeModify.vue";
export default {
name: "InvProducts",
data() {
return {
filterQuery: {
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
code: null,
type: 3,
orderId: null,
productName: null,
nameCode: null,
batchNo: null,
zczbhhzbapzbh: null,
page: 1,
limit: 20,
},
list: [],
total: 0,
invList: [],
spaceList: [],
loading: false,
productPlaceDialogVisible: false,
orderPlaceDialogVisible: false,
placeChangeDialogVisible: false,
typeNames: {
1: "按物资上架",
2: "按单上架"
},
showSearch: true
};
},
methods: {
hideSearch() {
this.showSearch = !this.showSearch;
},
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
code: null,
type: 1,
orderId: null,
productName: null,
nameCode: null,
batchNo: null,
zczbhhzbapzbh: null,
page: 1,
limit: 20,
};
this.getList();
},
onSubmit() {
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
getInvPlaceOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
this.total = res.data.total || 0;
} else {
this.$message.error(res.message);
this.list = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.$message.error(error.message);
this.list = [];
this.total = 0;
});
},
invChange() {
this.spaceList = [];
this.filterQuery.invSpaceCode = null;
this.getSpaceList();
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
this.getList();
this.getSpaceList();
})
.catch(() => {
});
},
getSpaceList() {
let params = {
invWarehouseCode: this.filterQuery.invCode,
status: 1
};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
})
},
invPlace(type) {
if (type === 3) {
this.placeChangeDialogVisible = true;
}
},
closePlaceDialog(type) {
if (type === 3) {
this.placeChangeDialogVisible = false;
}
this.getList();
},
typeChange() {
if (this.filterQuery.type === 1) {
this.filterQuery.orderId = null;
}
this.getList();
},
keyup_submit(event) {
this.getList();
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
},
},
components: {
invProductPlaceModify,
invOrderPlaceModify, InvPlaceChangeModify
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getInvList();
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -92,7 +92,7 @@
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column
label="DI/物资编码"
prop="relId"
prop="nameCode"
width="150"
></el-table-column>
<el-table-column

@ -0,0 +1,296 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="18">
<el-form-item class="query-form-item" label="UDI码:">
<el-input v-model="filterQuery.code"
placeholder="请扫描或输入UDI码"
ref="inputRef"
clearable
style="width: 97%"
@keyup.enter.native="keyup_submit($event)"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
@change="invChange"
style="width: 90%"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="货位:">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
@change="getList"
style="width: 90%"
>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="上架方式:">-->
<!-- <el-select v-model="filterQuery.type" placeholder="请选择上架方式" clearable="true"-->
<!-- @change="typeChange"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option :value="1" label="按物资上架"></el-option>-->
<!-- <el-option :value="2" label="按单上架"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.orderId" :disabled="filterQuery.type !== 2" placeholder="请输入单号"
clearable style="width: 90%"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="产品名称:">
<el-input v-model="filterQuery.productName" placeholder="请输入产品名称" clearable
style="width: 90%"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="产品标识:">
<el-input v-model="filterQuery.nameCode" placeholder="请输入产品标识" clearable
style="width: 90%"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="请输入批次号" clearable
style="width: 90%"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="注册备案号:">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="请输入注册备案号" clearable
style="width: 90%"></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-box" @click="invPlace(4)"></el-button>
</el-button-group>
</div>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="记录号" prop="recordId" width="180"></el-table-column>
<el-table-column label="仓库" prop="invName" width="180"></el-table-column>
<el-table-column label="操作时间" prop="createTime" width="150"></el-table-column>
<el-table-column label="操作前货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="操作后货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="单号" v-if="filterQuery.type === 2" prop="orderId" width="120"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="数量" prop="count" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="计量单位" prop="expireDate" width="120"></el-table-column>
<el-table-column label="注册备案号" prop="zczbhhzbapzbh" show-overflow-tooltip
width="200"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip
width="200"></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip
width="200"></el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="getList"
></pagination>
</el-card>
<el-dialog
title="物资下架"
:visible.sync="productPlaceDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="productPlaceDialogVisible"
>
<invProductPlaceOutModify
:closePlaceDialog="closePlaceDialog"
></invProductPlaceOutModify>
</el-dialog>
</div>
</template>
<script>
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import {getInvPlaceOrderList, getInvPlaceOrderDetailList} from "@/api/inventory/invPlaceOrder";
import {isBlank} from "@/utils/strUtil";
import invProductPlaceOutModify from "@/views/inventory/InvProductPlaceOutModify.vue";
export default {
name: "InvProducts",
data() {
return {
filterQuery: {
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
code: null,
type: 4,
orderId: null,
productName: null,
nameCode: null,
batchNo: null,
zczbhhzbapzbh: null,
page: 1,
limit: 20,
},
list: [],
total: 0,
invList: [],
spaceList: [],
loading: false,
productPlaceDialogVisible: false,
showSearch: true
};
},
methods: {
hideSearch() {
this.showSearch = !this.showSearch;
},
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
code: null,
type: 1,
orderId: null,
productName: null,
nameCode: null,
batchNo: null,
zczbhhzbapzbh: null,
page: 1,
limit: 20,
};
this.getList();
},
onSubmit() {
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
getInvPlaceOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
this.total = res.data.total || 0;
} else {
this.$message.error(res.message);
this.list = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.$message.error(error.message);
this.list = [];
this.total = 0;
});
},
invChange() {
this.spaceList = [];
this.filterQuery.invSpaceCode = null;
this.getSpaceList();
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
this.getList();
this.getSpaceList();
})
.catch(() => {
});
},
getSpaceList() {
let params = {
invWarehouseCode: this.filterQuery.invCode,
status: 1
};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
})
},
invPlace() {
this.productPlaceDialogVisible = true;
},
closePlaceDialog(type) {
this.productPlaceDialogVisible = false;
this.getList();
},
typeChange() {
if (this.filterQuery.type === 1) {
this.filterQuery.orderId = null;
}
this.getList();
},
keyup_submit(event) {
this.getList();
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
},
},
components: {
invProductPlaceOutModify
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getInvList();
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -104,7 +104,7 @@
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button>
<el-button type="primary" icon="el-icon-box" @click="invPlace(1)"></el-button>
<el-button type="primary" icon="el-icon-box" @click="invPlace(2)"></el-button>
<el-button type="primary" icon="el-icon-box" @click="invPlace(3)"></el-button>
<!-- <el-button type="primary" icon="el-icon-box" @click="invPlace(3)"></el-button>-->
</el-button-group>
</div>
@ -114,7 +114,6 @@
<el-table-column label="记录号" prop="recordId" width="180"></el-table-column>
<el-table-column label="仓库" prop="invName" width="180"></el-table-column>
<el-table-column label="操作时间" prop="createTime" width="150"></el-table-column>
<el-table-column label="操作前货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="操作后货位" prop="invSpaceName" width="180"></el-table-column>
<!-- <el-table-column label="操作人" prop="operatorName" width="120"></el-table-column>-->
<!-- <el-table-column label="上架方式" prop="type" width="120">-->
@ -124,7 +123,7 @@
<!-- </el-table-column>-->
<el-table-column label="单号" v-if="filterQuery.type === 2" prop="orderId" width="120"></el-table-column>
<!-- <el-table-column label="产品标识" prop="nameCode" width="150"></el-table-column>-->
<el-table-column label="DI/物资编码" prop="relId" width="150"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="数量" prop="count" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>
@ -174,20 +173,6 @@
></invOrderPlaceModify>
</el-dialog>
<el-dialog
title="货位变更"
:visible.sync="placeChangeDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="placeChangeDialogVisible"
>
<InvPlaceChangeModify
:closePlaceDialog="closePlaceDialog"
></InvPlaceChangeModify>
</el-dialog>
</div>
</template>
@ -224,7 +209,6 @@ export default {
loading: false,
productPlaceDialogVisible: false,
orderPlaceDialogVisible: false,
placeChangeDialogVisible: false,
typeNames: {
1: "按物资上架",
2: "按单上架"
@ -308,8 +292,6 @@ export default {
this.productPlaceDialogVisible = true;
} else if (type === 2) {
this.orderPlaceDialogVisible = true;
} else if (type === 3) {
this.placeChangeDialogVisible = true;
}
},
closePlaceDialog(type) {
@ -317,8 +299,6 @@ export default {
this.productPlaceDialogVisible = false;
} else if (type === 2) {
this.orderPlaceDialogVisible = false;
} else if (type === 3) {
this.placeChangeDialogVisible = false;
}
this.getList();
},

@ -103,7 +103,7 @@
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column
label="DI/物资编码"
prop="relId"
prop="nameCode"
width="150"
></el-table-column>
<el-table-column
@ -227,7 +227,7 @@ export default {
bindInvSpace(params)
.then((res) => {
if (res.code === 20000) {
this.$message.success("上架成功");
this.$message.success("变更成功");
this.clearFormData();
this.$nextTick(() => {
this.$refs.spaceInputRef.focus();

@ -0,0 +1,135 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="18">
<el-form-item class="query-form-item" label="编码:">
<el-input v-model="filterQuery.code" placeholder="请扫描或输入编码" ref="inputRef" clearable style="width: 97%" @keyup.enter.native="keyup_submit($event)"></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-group>
</div>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="部门" prop="deptName" width="180"></el-table-column>
<el-table-column label="仓库" prop="invName" width="180"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="单号" v-if="filterQuery.type === 2" prop="orderId" width="120"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="数量" prop="count" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="计量单位" prop="measname" width="120"></el-table-column>
<el-table-column label="注册备案号" prop="zczbhhzbapzbh" show-overflow-tooltip
width="200"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip
width="200"></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip
width="200"></el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="getList"
></pagination>
</el-card>
</div>
</template>
<script>
import {getInvPlaceOrderList, selectPlaceList} from "@/api/inventory/invPlaceOrder";
export default {
name: "InvProducts",
data() {
return {
filterQuery: {
code: null,
page: 1,
limit: 20,
},
list: [],
total: 0,
invList: [],
spaceList: [],
loading: false,
showSearch: true
};
},
methods: {
hideSearch() {
this.showSearch = !this.showSearch;
},
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
code:null,
page: 1,
limit: 20,
};
this.getList();
},
onSubmit() {
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
selectPlaceList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
this.total = res.data.total || 0;
} else {
this.$message.error(res.message);
this.list = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.$message.error(error.message);
this.list = [];
this.total = 0;
});
},
keyup_submit(event) {
this.getList();
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
},
},
components: {},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -153,6 +153,7 @@
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="货架" prop="spaceName" v-if="filterQuery.invSpaceCode!='' && filterQuery.invSpaceCode!=null" show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>

@ -0,0 +1,313 @@
<template>
<el-form :model="formData" label-width="100px">
<el-button-group
style="display: flex; margin: 0px 0 10px 80%; height: 35px"
>
<el-button size="mini" type="primary" @click.native="saveData()"
>提交
</el-button
>
<el-button size="mini" type="primary" @click.native="closePlaceDialog(1)"
>关闭
</el-button
>
</el-button-group>
<el-row>
<el-col :span="10">
<el-form-item prop="invWarehouseCode" label="下架仓库:">
<el-select
v-model="formData.invCode"
placeholder="当前仓库信息"
:disabled="list.length > 0"
@change="invChange"
style="width: 90%"
clearable
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="下架货位:">
<el-autocomplete
v-model="formData.invSpaceName"
:disabled="list.length > 0"
:fetch-suggestions="querySearchAsync"
placeholder="请输入内容"
ref="spaceInputRef"
@select="handleSelect"
@keypress.enter.native="spaceEnterKey($event)"
clearable
style="width: 90%"
></el-autocomplete>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="18">
<el-form-item class="query-form-item" label="扫码录入:">
<el-input
id="inputer"
@focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)"
ref="inputRef"
style="ime-mode: disabled"
type="tel"
v-model="formData.code"
></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<el-button type="primary" size="mini" @click.native.stop="addCode()" style="margin-left: 15px">添加</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="list" style="width: 100%; margin-top: 20px" highlight-current-row border max-height="300" height="300">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="150" show-tooltip-when-overflow></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
<el-table-column label="计量单位" prop="measname" width="150"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="150"></el-table-column>
<el-table-column label="数量" prop="count" width="150"></el-table-column>
<el-table-column label="注册备案号" prop="zczbhhzbapzbh" width="150" show-tooltip-when-overflow></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" width="150"></el-table-column>
<el-table-column label="供应商" prop="supName" width="150"></el-table-column>
</el-table>
</el-form>
</template>
<script>
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import {isBlank} from "@/utils/strUtil";
import {
bindInvSpace,
getInvPlaceOrderDetailList,
getInvProductInfo, getInvProductOutInfo, unbindInvOrderSpace,
} from "@/api/inventory/invPlace";
export default {
props: {
closePlaceDialog: {
type: Function,
required: true,
},
},
name: "InvProductPlaceModify",
data() {
return {
formData: {
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
invSpaceName: null,
code: null,
},
orderId: null,
list: [],
codeArray: [],
invList: [],
spaceList: [],
loading: false,
spaceSearchResult: [],
};
},
methods: {
saveData() {
if (isBlank(this.formData.invCode)) {
this.$message.error("请选择当前仓库");
return;
}
if (isBlank(this.formData.invSpaceCode)) {
this.$message.error("请选择当前货位");
return;
}
this.$confirm("是否确认保存当前数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
let params = {
invCode: this.formData.invCode,
invSpaceCode: this.formData.invSpaceCode,
type: 4,
orderId: this.orderId,
outCount: this.list.length
};
unbindInvOrderSpace(params)
.then((res) => {
if (res.code === 20000) {
this.$message.success("下架成功");
this.clearFormData();
this.$nextTick(() => {
this.$refs.spaceInputRef.focus();
});
} else {
this.$message.error(res.message);
}
})
.catch((error) => {
this.$message.error(error.message);
});
})
.catch(() => {
});
},
clearFormData() {
//
this.formData = {
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
invSpaceName: null,
code: null,
};
this.orderId = null;
this.codeArray = [];
this.list = [];
//
this.$refs.spaceInputRef.focus();
},
invChange() {
this.formData.invSpaceCode = null;
this.formData.invSpaceName = null;
this.list.forEach((item) => {
item.invSpaceCode = null;
item.invSpaceName = null;
});
this.getSpaceList();
this.$nextTick(() => {
this.$refs.spaceInputRef.focus();
});
},
querySearchAsync(queryString, cb) {
let restaurants = this.spaceList;
restaurants.forEach((item) => {
item.value = item.name;
});
let results = queryString
? restaurants.filter(this.createStateFilter(queryString))
: restaurants;
if (!isBlank(queryString)) {
this.spaceSearchResult = results;
}
cb(results);
},
createStateFilter(queryString) {
return (state) => {
const {value, code} = state;
return (
value === queryString.toLowerCase() ||
code === queryString.toLowerCase()
);
};
},
handleSelect(item) {
this.formData.invSpaceCode = item.code;
this.formData.invSpaceName = item.name;
this.list.forEach((invProduct) => {
invProduct.invSpaceCode = item.code;
invProduct.invSpaceName = item.name;
});
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
this.getSpaceList();
this.getList();
this.$refs.spaceInputRef.focus();
})
.catch(() => {
});
},
getSpaceList() {
let params = {
invWarehouseCode: this.formData.invCode,
status: 1,
};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
});
},
addCode(event) {
if (event != null) {
event.target.select();
}
this.$refs.inputRef.select();
if (isBlank(this.formData.invCode)) {
this.$message.error("下架仓库不能为空");
return;
}
if (isBlank(this.formData.invSpaceCode)) {
this.$message.error("下架货位不能为空");
return;
}
this.formData.code = this.formData.code.trim();
if (this.$isBlank(this.formData.code)) return;
this.getInvProductInfo(this.formData.code);
this.$refs.inputRef.select();
},
getInvProductInfo(code) {
let params = {
orderId: this.orderId,
invCode: this.formData.invCode,
code: code,
type: 4,
invSpaceCode: this.formData.invSpaceCode,
};
getInvProductOutInfo(params).then((res) => {
if (res.code == 20000) {
this.orderId = res.data;
getInvPlaceOrderDetailList({orderId: this.orderId}).then((res) => {
this.list = res.data.list;
});
} else {
this.$message.warning(res.message);
}
});
},
getInputFocus(event) {
event.currentTarget.select();
},
enterKey(event) {
this.checkSuccess = true;
this.addCode(event);
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
},
spaceEnterKey(event) {
if (this.spaceSearchResult.length > 0) {
this.handleSelect(this.spaceSearchResult[0]);
this.$refs.spaceInputRef.close();
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
} else {
event.target.select();
}
},
},
created() {
this.getInvList();
},
mounted() {
//
this.$refs.spaceInputRef.focus();
},
};
</script>
<style scoped></style>

@ -153,6 +153,7 @@
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="货架" prop="spaceName" v-if="filterQuery.invSpaceCode!='' && filterQuery.invSpaceCode!=null" show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
@ -252,7 +253,7 @@ export default {
supId: null,
zczbhhzbapzbh: null,
ylqxzcrbarmc: null,
invCode: null,
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
page: 1,
limit: 10,
@ -471,6 +472,7 @@ export default {
};
},
created() {
this.filterQuery.invCode=this.$store.getters.locInvCode
let supId = this.$store.getters.customerId;
if (supId == "110") {
this.showSup = true;

@ -151,8 +151,8 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="货架" prop="spaceName" v-if="filterQuery.invSpaceCode!='' && filterQuery.invSpaceCode!=null" show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>

@ -174,6 +174,7 @@ export default {
editStatus: 1,
emergency:'',
targetDeptCode:'',
targetInvCode:null
},
isChang:false,
formName: null,
@ -247,6 +248,7 @@ export default {
this.$router.push({
path: "",
});
let deptCode = this.filterQuery.targetDeptCode
this.filterQuery = {
billNo: "",
thirdSysFk: "",
@ -260,7 +262,11 @@ export default {
type: 1,
editStatus: 1,
targetDeptCode: this.invCodebe,
targetInvCode:null
};
if(deptCode!=this.invCodebe){
this.getInvList()
}
this.actDateRange = [];
this.getList();
},
@ -405,6 +411,8 @@ export default {
var query={
parentId:this.filterQuery.targetDeptCode
}
this.filterQuery.targetInvCode = null
this.$forceUpdate()
filterSubAll(query).then((res) => {
this.invList = res.data || [];
})

@ -286,7 +286,7 @@ export default {
return this.$message.error("单据日期不能为空!");
}
if (this.formData.targetInvCode == "" || this.formData.targetInvCode == null) {
return this.$message.error("采购科室不能为空!");
return this.$message.error("申购仓库不能为空!");
}
if (this.formData.emergency == "" || this.formData.emergency == null) {
return this.$message.error("紧急程度不能为空!");

Loading…
Cancel
Save