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

Merge remote-tracking branch 'origin/master'

Browse Source
prod
wj 2 years ago
parent 4db31ec0dc db844eac61
commit 30e1e0af7d
4 changed files with 61 additions and 46 deletions
Show Stats Download Patch File Download Diff File

9
src/api/inventory/invPlace.js
Unescape Escape View File

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

24
src/views/inventory/InvPlace.vue
Unescape Escape View File

@ -112,22 +112,24 @@
border> border>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="仓库" prop="invName" 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="操作时间" prop="createTime" width="150"></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="operatorName" width="120"></el-table-column> <el-table-column label="操作后货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="上架方式" prop="type" width="120"> <!-- <el-table-column label="操作人" prop="operatorName" width="120"></el-table-column>-->
<template slot-scope="scope"> <!-- <el-table-column label="上架方式" prop="type" width="120">-->
<el-tag>{{ typeNames[scope.row.type] }}</el-tag> <!-- <template slot-scope="scope">-->
</template> <!-- <el-tag>{{ typeNames[scope.row.type] }}</el-tag>-->
</el-table-column> <!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="单号" v-if="filterQuery.type === 2" prop="orderId" width="120"></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="产品标识" prop="nameCode" width="150"></el-table-column>-->
<el-table-column label="物资编码" prop="relId" width="150"></el-table-column> <el-table-column label="DI/物资编码" prop="relId" width="150"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="200" show-overflow-tooltip></el-table-column> <el-table-column label="物资名称" prop="productName" width="200" 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="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="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" 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="expireDate" width="120"></el-table-column>
<el-table-column label="注册备案号" prop="zczbhhzbapzbh" show-overflow-tooltip <el-table-column label="注册备案号" prop="zczbhhzbapzbh" show-overflow-tooltip
width="200"></el-table-column> width="200"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip

29
src/views/inventory/InvProductPlaceModify.vue
Unescape Escape View File

@ -24,9 +24,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item class="query-form-item" label="当前货位:"> <el-form-item class="query-form-item" label="上架货位:">
<el-autocomplete <el-autocomplete
v-model="formData.invSpaceName" v-model="formData.invSpaceName"
:disabled="list.length>0"
:fetch-suggestions="querySearchAsync" :fetch-suggestions="querySearchAsync"
placeholder="请输入内容" placeholder="请输入内容"
ref="spaceInputRef" ref="spaceInputRef"
@ -76,6 +77,7 @@
<el-table-column label="序列号" prop="serialNo" 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="measname" width="150"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" 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="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="manufactory" width="150"></el-table-column>
<el-table-column label="供应商" prop="supName" width="150"></el-table-column> <el-table-column label="供应商" prop="supName" width="150"></el-table-column>
@ -87,7 +89,7 @@
import {getInvListByUser} from "@/api/system/invWarehouse"; import {getInvListByUser} from "@/api/system/invWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace"; import {getInvSpaceList} from "@/api/inventory/invSpace";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {bindInvSpace, getInvProductInfo} from "@/api/inventory/invPlace"; import {bindInvSpace, getInvPlaceOrderDetailList, getInvProductInfo} from "@/api/inventory/invPlace";
export default { export default {
props: { props: {
@ -105,6 +107,7 @@ export default {
invSpaceName: null, invSpaceName: null,
code: null, code: null,
}, },
orderId: null,
list: [], list: [],
codeArray: [], codeArray: [],
invList: [], invList: [],
@ -132,14 +135,11 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.list.forEach((item) => {
this.codeArray.push(item.code);
});
let params = { let params = {
invCode: this.formData.invCode, invCode: this.formData.invCode,
invSpaceCode: this.formData.invSpaceCode, invSpaceCode: this.formData.invSpaceCode,
type: 1, //按物资上架 type: 1, //按物资上架
codeArray: this.codeArray orderId: this.orderId,
}; };
bindInvSpace(params).then((res) => { bindInvSpace(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
@ -162,6 +162,7 @@ export default {
invSpaceName: null, invSpaceName: null,
code: null, code: null,
}; };
this.orderId=null;
this.codeArray = []; this.codeArray = [];
this.list = []; this.list = [];
//光标切回货位框 //光标切回货位框
@ -233,7 +234,7 @@ export default {
} }
if (isBlank(this.formData.invSpaceCode)) { if (isBlank(this.formData.invSpaceCode)) {
this.$message.error('当前货位不能为空'); this.$message.error('上架货位不能为空');
return; return;
} }
@ -244,16 +245,20 @@ export default {
}, },
getInvProductInfo(code) { getInvProductInfo(code) {
let params = { let params = {
orderId: this.orderId,
invCode: this.formData.invCode, invCode: this.formData.invCode,
code: code code: code,
invSpaceCode: this.formData.invSpaceCode,
}; };
getInvProductInfo(params).then((res) => { getInvProductInfo(params).then((res) => {
if (res.data !== null) { if (res.code == 20000) {
res.data.forEach((item) => { debugger
this.list.push(item); this.orderId=res.data;
getInvPlaceOrderDetailList({orderId:this.orderId}).then((res) => {
this.list=res.data.list;
}); });
} else { } else {
this.$message.warning("未查询到产品信息"); this.$message.warning(res.message);
} }
}) })
}, },

45
src/views/sync/SysUdimsConfig.vue
Unescape Escape View File

@ -69,7 +69,6 @@
label-positiom="right" label-positiom="right"
label-width="200px" label-width="200px"
:inline="true" :inline="true"
disabled
> >
<el-form-item label="数据上传时间间隔(单位:分钟):"> <el-form-item label="数据上传时间间隔(单位:分钟):">
<el-input <el-input
@ -80,15 +79,15 @@
splaceholder="请输入内容" splaceholder="请输入内容"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="延时上传(单位:分钟):"> <!-- <el-form-item label="延时上传(单位:分钟):">-->
<el-input <!-- <el-input-->
style="width: 100px" <!-- style="width: 100px"-->
size="small" <!-- size="small"-->
type="number" <!-- type="number"-->
v-model="configQuery.delaySyncTime" <!-- v-model="configQuery.delaySyncTime"-->
splaceholder="请输入内容" <!-- splaceholder="请输入内容"-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="数据下载时间间隔(单位:分钟):"> <el-form-item label="数据下载时间间隔(单位:分钟):">
<el-input <el-input
style="width: 100px" style="width: 100px"
@ -246,7 +245,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="发票信息"> <el-form-item label="发票信息">
<el-select v-model="configQuery.orderInvoice" > <el-select v-model="configQuery.orderInvoice">
<el-option :value="0" label="不同步"></el-option> <el-option :value="0" label="不同步"></el-option>
<el-option :value="1" label="由内向外"></el-option> <el-option :value="1" label="由内向外"></el-option>
<el-option :value="2" label="由外向内"></el-option> <el-option :value="2" label="由外向内"></el-option>
@ -339,11 +338,11 @@
size="small" size="small"
type="number" type="number"
v-model="configQuery.orderToInSyncTime" v-model="configQuery.orderToInSyncTime"
:disabled="configQuery.downstreamEnable"
splaceholder="请输入内容" splaceholder="请输入内容"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</el-descriptions-item> </el-descriptions-item>
@ -424,18 +423,18 @@
:disabled="configQuery.downstreamEnable" :disabled="configQuery.downstreamEnable"
splaceholder="请输入内容" splaceholder="请输入内容"
></el-input> ></el-input>
<!-- <span style="margin-left: 30px"-->
<!-- >单据下载时间间隔(单位:分钟):&nbsp;</span-->
<!-- >-->
<!-- <el-input-->
<!-- style="width: 100px"-->
<!-- size="small"-->
<!-- type="number"-->
<!-- v-model="configQuery.orderSyncDlTime"-->
<!-- :disabled="configQuery.downstreamEnable"-->
<!-- splaceholder="请输入内容"-->
<!-- ></el-input>-->
<span style="margin-left: 30px"
>单据下载时间间隔(单位:分钟):&nbsp;</span
>
<el-input
style="width: 100px"
size="small"
type="number"
v-model="configQuery.orderSyncDlTime"
:disabled="configQuery.downstreamEnable"
splaceholder="请输入内容"
></el-input>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>

Write Preview
Loading…
Cancel
Save