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

设备领用代码提交

Browse Source
20231126-yw
郑明梁 2 years ago
parent f0ed4bf9c8
commit 37e59aa571
2 changed files with 100 additions and 39 deletions
Show Stats Download Patch File Download Diff File

34
src/views/inventory/DeviceReceiveOrderModify.vue
Unescape Escape View File

@ -17,7 +17,7 @@
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="领用记录号:">
<el-form-item class="query-form-item" label="登记记录号:">
<el-input v-model="formData.orderId"
auto-complete="off"
:disabled="true"
@ -27,7 +27,7 @@
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="领用时间:">
<el-form-item class="query-form-item" label="登记时间:">
<el-input v-model="formData.createTime"
auto-complete="off"
:disabled="true"
@ -40,8 +40,8 @@
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="领用部门:">
<el-select v-model="formData.fromDeptCode" placeholder="领用部门信息"
<el-form-item class="query-form-item" label="登记部门:">
<el-select v-model="formData.fromDeptCode" placeholder="请选择登记部门信息"
:disabled="detailList.length >0 && this.paramValue == 0 "
style="width: 90%;"
disabled
@ -60,7 +60,7 @@
<el-col :span="10" v-if="paramValue == 0">
<el-form-item class="query-form-item" label="出库仓库:">
<el-select v-model="formData.fromInvCode" placeholder="出库仓库信息"
<el-select v-model="formData.fromInvCode" placeholder="请选择出库仓库信息"
:disabled="detailList.length >0 && paramValue == 0 "
style="width: 90%"
clearable>
@ -90,12 +90,9 @@
border max-height="300" height="300">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<!-- <el-table-column label="条码" width="180" prop="originCode" show-overflow-tooltip></el-table-column>-->
<el-table-column width="150"
label="产品通用名"
prop="productName"
show-overflow-tooltip
></el-table-column>
<el-table-column width="150" label="产品通用名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="DI/物资编码" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column width="120" label="批次号">
<template slot-scope="scope">
<el-input v-model="scope.row.batchNo"
@ -125,9 +122,8 @@
></el-input>
</template>
</el-table-column>
<el-table-column width="150" label="序列号" prop="serialNo"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
@ -246,7 +242,7 @@
</el-dialog>
<el-dialog
title="设备领用-物资字典录入"
title="设备登记-物资字典录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
@ -476,13 +472,13 @@ export default {
this.$message.warning(message);
return;
}
//保存或更新设备领用仓库信息
//保存或更新设备登记仓库信息
this.saveOrder();
this.onReset();
this.selectInvProductVisible = true;
this.filterQuery.invCode = this.formData.fromInvCode;
} else {
//保存或更新设备领用仓库信息
//保存或更新设备登记仓库信息
this.saveOrder();
this.onProductReset();
this.selectProductVisible = true;
@ -508,7 +504,7 @@ export default {
this.formData.orderId = res.data.orderId;
this.formData.createTime = res.data.createTime;
if (!isBlank(code)) {
//扫码添加设备领用记录详情
//扫码添加设备登记记录详情
if (!isBlank(this.formData.code)) {
this.addScanCode();
}
@ -552,7 +548,7 @@ export default {
},
verifyOrder() {
if (isBlank(this.formData.fromDeptCode)) {
return "请选择领用部门！";
return "请选择登记部门！";
} else if (isBlank(this.formData.fromInvCode)) {
return "请选择出库仓库！";
} else if (this.detailList == null || this.detailList.length == 0) {
@ -628,7 +624,7 @@ export default {
},
deleteOrderDetail(index, row) {
if (row.count === 1) {
this.$confirm('此产品领用数量为1，减一后将删除此产品领用记录，是否继续?', '提示', {
this.$confirm('此产品登记数量为1，减一后将删除此产品登记记录，是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@ -751,7 +747,7 @@ export default {
},
combine() {
if (this.multiProduct.length === 0) {
this.$message.error("请选择领用产品！");
this.$message.error("请选择登记产品！");
return;
}
let invProductIds = [];

105
src/views/inventory/DeviceReceiveOrderNew.vue
Unescape Escape View File

@ -4,14 +4,15 @@
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="领用记录号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入领用记录号" style="width: 90%"
<el-form-item class="query-form-item" label="登记记录号:">
<el-input v-model="filterQuery.orderId" placeholder="请输入登记记录号" style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="领用部门:">
<el-select v-model="filterQuery.fromDeptCode" placeholder="请选择部门" clearable="true" style="width: 90%"
<el-form-item class="query-form-item" label="登记部门:">
<el-select v-model="filterQuery.fromDeptCode" placeholder="请选择登记部门" clearable="true"
style="width: 90%"
@change="getDeptList"
>
<el-option
@ -25,15 +26,15 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="领用人:">
<el-input v-model="filterQuery.receiveUserName" placeholder="请输入领用人" style="width: 90%"
<el-form-item class="query-form-item" label="登记人:">
<el-input v-model="filterQuery.receiveUserName" placeholder="请输入登记人" style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="领用日期:">
<el-form-item label="登记时间:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
@ -42,8 +43,8 @@
style="width: 90%"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
start-placeholder="开始时间"
end-placeholder="结束时间"
>
</el-date-picker>
</el-form-item>
@ -56,20 +57,20 @@
<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-plus" @click="addReceiveOrder">新增领用记录</el-button>
<el-button type="primary" icon="el-icon-plus" @click="addReceiveOrder">新增设备登记</el-button>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border>
@current-change="handleChange" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="设备领用记录号" prop="orderId"></el-table-column>
<el-table-column label="领用部门" prop="fromDeptName"></el-table-column>
<el-table-column label="登记记录号" prop="orderId"></el-table-column>
<el-table-column label="登记部门" prop="fromDeptName"></el-table-column>
<el-table-column label="出库仓库" prop="fromInvName" v-if="paramValue == 0"></el-table-column>
<!-- <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>-->
<el-table-column label="领用人" prop="receiveUserName"></el-table-column>
<el-table-column label="领用日期" prop="createTime"></el-table-column>
<el-table-column label="登记人" prop="receiveUserName"></el-table-column>
<el-table-column label="登记时间" prop="createTime"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
@ -116,6 +117,38 @@
:closeDialog="closeDialog"
></deviceReceiveOrderModify>
</el-dialog>
<el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="产品通用名称" prop="productName" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="200"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" width="300" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="300" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="supName"width="300" show-overflow-tooltip></el-table-column>
<!-- <el-table-column label="操作" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="datailSelect(scope.row)"-->
<!-- >详情-->
<!-- </el-button-->
<!-- >-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
v-show="detailTotal>0"
:total="detailTotal"
:limit.sync="detailQuery.limit"
:page.sync="detailQuery.page"
@pagination="getDetailList"
></pagination>
</el-card>
</div>
</template>
@ -129,9 +162,10 @@ import {
submitAudit,
deleteDeviceReceiveOrder,
getDeviceReceiveOrderList,
getConfig
getConfig, getDeviceReceiveOrderDetailList
} from "@/api/inventory/deviceReceiveOrder";
import {isBlank} from "@/utils/strUtil";
import {filterByorderIdFk} from "@/api/inventory/deviceRepairOrderDetail";
export default {
name: "DeviceReceiveOrderNew",
@ -148,9 +182,16 @@ export default {
limit: 20,
},
list: [],
detailQuery: {
orderIdFk: null,
page: 1,
limit: 20,
},
total: 0,
detailTotal: 0,
deptList: [],
invList: [],
detailList: [],
spaceList: [],
actDateRange: [],
loading: false,
@ -165,8 +206,8 @@ export default {
},
formName: null,
formMap: {
add: "设备领用-库存产品录入",
edit: "设备领用-库存产品录入"
add: "新增设备登记",
edit: "编辑设备登记"
},
deviceReceiveOrder: {},
pickerOptions: {
@ -322,6 +363,7 @@ export default {
if (res.code === 20000) {
this.$message.success("删除成功！");
this.getList();
this.detailList = []
} else {
this.$message.error(res.message);
}
@ -334,6 +376,29 @@ export default {
this.formVisible = false;
this.getList();
},
datailSelect(row) {
this.detailQuery = row
this.deviceProjectSelectVisible = true
},
handleChange(row) {
this.detailQuery.orderIdFk = row.orderId;
this.detailQuery.page = 1;
this.getDetailList();
},
getDetailList() {
getDeviceReceiveOrderDetailList(this.detailQuery).then((res) => {
if (res.code === 20000) {
this.detailList = res.data.list || [];
this.detailTotal = res.data.total || 0;
} else {
this.detailList = [];
this.detailTotal = 0;
}
}).catch(() => {
this.detailList = [];
this.detailTotal = 0;
});
},
},
components: {
deviceReceiveOrderModify
@ -347,8 +412,8 @@ export default {
created() {
//查询配置项
getConfig().then((res) => {
if(res.code == 20000 && !isBlank(res.data.paramValue)){
this.paramValue =res.data.paramValue
if (res.code == 20000 && !isBlank(res.data.paramValue)) {
this.paramValue = res.data.paramValue
}
})
this.getDeptList();

Write Preview
Loading…
Cancel
Save