领用相关问题修改

20231126-yw
anthonywj 2 years ago
parent 499779d04f
commit 3e45eca2fd

@ -8,7 +8,7 @@ ENV = 'production'
#林纪裕cd
# VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
@ -30,7 +30,7 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://192.168.0.242:9150/UDI_WMS_MC/'
# 平潭正式
VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# 吴总测试服务器.

@ -49,6 +49,15 @@ export function findByUp(query) {
}
export function findLyInv(query) {
return axios({
url: "/spms/inv/warehouse/findLyInv",
method: "get",
params: query
});
}
export function filterSubByInv(query) {
return axios({
url: "/spms/inv/warehouse/findByUser",

@ -4,13 +4,13 @@
<el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="6">
<el-form-item label="产品标识DI:">
<el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入产品标识DI"></el-input>
<el-form-item label="DI/物资编码:">
<el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入DI/物资编码"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品名称:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品名称"></el-input>
<el-form-item label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -23,6 +23,33 @@
<el-input v-model="filterQuery.batchNo" style="width: 90%" placeholder="请输入批次号"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="生产企业:" class="query-form-item">
<el-input v-model="filterQuery.manufactory" style="width: 100%" placeholder="请输入生产企业/注册备案人"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物资分类:" class="query-form-item">
<el-input v-model="filterQuery.category" style="width: 100%" placeholder="请输入物资分类名称"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1+':'" class="query-form-item">
<el-input v-model="filterQuery.basicPrductRemak1" style="width: 100%"
:placeholder="productRemarkSet.remarkTitle1"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-if="productRemarkSet.remarkEnable2">
<el-form-item :label="productRemarkSet.remarkTitle2 +':'" class="query-form-item">
<el-input v-model="filterQuery.basicPrductRemak2" style="width: 100%"
:placeholder="productRemarkSet.remarkTitle2"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -38,21 +65,22 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="false" border ref="multipleTable">
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="false" border
ref="multipleTable">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc"></el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productionDate"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column>
<el-table-column label="入库数量" prop="inCount"></el-table-column>
<el-table-column label="出库数量" prop="outCount"></el-table-column>
<el-table-column label="结余数量" prop="reCount"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" width="200"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="200"></el-table-column>
<el-table-column label="供应商" prop="supName" width="260"></el-table-column>
<el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="90"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="90"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="90"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="90"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="90"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="90"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" width="180"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
<el-table-column label="供应商" prop="supName" width="180"></el-table-column>
</el-table>
</el-card>
@ -74,6 +102,7 @@ import {addDetail} from "@/api/inout/receiveOrder";
import {addBizProduct} from "@/api/inout/orderDetailCode";
import {getInvPreInProduct, getInvPreInProductStock} from "@/api/inventory/invPreInSearch";
import {getInvPreProduct, getInvPreProductStock} from "@/api/inventory/invPreProduct";
import {finProductSet} from "@/api/param/systemParamConfig";
export default {
@ -130,6 +159,7 @@ export default {
idQuery: null,
showSup: false,
fromOptions: [],
productRemarkSet: {},
};
},
components: {},
@ -293,8 +323,14 @@ export default {
this.loading = false;
});
}
},
findBasicProductSet() {
finProductSet().then((response) => {
if (response.code == 20000) {
this.productRemarkSet = response.data;
}
});
},
},
filters: {
@ -313,6 +349,7 @@ export default {
};
},
created() {
this.findBasicProductSet();
this.filterQuery.invCode = this.invQueryData.targetInvCode;
//
this.getList();

@ -6,48 +6,48 @@
v-show="showSearch"
label-width="100px">
<el-row>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="query-form-item" label="单据号:">
<el-input
v-model="listQuery.billNo"
placeholder="单据号"
placeholder="单据号" style="width: 100%"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="query-form-item" label="往来单位:">
<el-input
v-model="listQuery.corpName"
placeholder="往来单位"
placeholder="往来单位" style="width: 100%"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="领用类型">
<el-select v-model="listQuery.billType" placeholder="请选择领用类型" clearable="true">
<el-option
v-for="item in originTypes"
:key="item.originAction"
:label="item.originName"
:value="item.originAction">
<span style="float: left;font-size: 13px">{{ item.originAction }}</span>
<span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
item.originName
}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="领用类型">-->
<!-- <el-select v-model="listQuery.billType" placeholder="请选择领用类型" clearable="true">-->
<!-- <el-option-->
<!-- v-for="item in originTypes"-->
<!-- :key="item.originAction"-->
<!-- :label="item.originName"-->
<!-- :value="item.originAction">-->
<!-- <span style="float: left;font-size: 13px">{{ item.originAction }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
<!-- item.originName-->
<!-- }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-col :span="8">
<el-form-item class="query-form-item" label="单据日期:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
style="width: 100%"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
@ -86,8 +86,7 @@
@current-change="handleDetail"
>
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="领用类型" prop="billTypeName"></el-table-column>
<el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="领用单号" prop="billNo"></el-table-column>
<el-table-column label="领用仓库" prop="invName"></el-table-column>
<el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="单据日期" prop="createTime"></el-table-column>
@ -112,13 +111,13 @@
<el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="物资编码" prop="nameCode"></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column>
<el-table-column label="单据数量" prop="count"></el-table-column>
<el-table-column label="领用数量" prop="count"></el-table-column>
</el-table>
</el-card>

@ -62,7 +62,6 @@
<el-form-item class="query-form-item" prop="targetInvCode" label="领用仓库:">
<el-select v-model="formData.targetInvCode" placeholder="请选择领用仓库" @change="getTargerType"
clearable="true"
:disabled="true"
style="width: 100%"
>
<el-option
@ -140,10 +139,12 @@
<el-table-column label="供应商" prop="supName"></el-table-column>
<el-table-column label="操作" width="150">
<template slot-scope="scope">
<el-button type="text" size="small" :disabled="!ischeck" @click.stop="true"
<el-button type="text" size="small" :disabled="!ischeck || scope.row.index != selectedIndex"
@click.stop="true"
@click.native="save(scope.row)">保存
</el-button>
<el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
<el-button type="text" size="small" :disabled="scope.row.index == selectedIndex || ischeck"
@click.stop="true"
@click.native="rowChange(scope.row)">编辑
</el-button>
<el-button type="text" size="small" @click.stop="true"
@ -157,7 +158,7 @@
<el-dialog
title="库存设备录入"
title="库存物资录入"
:visible.sync="selectInvProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
@ -178,7 +179,7 @@
<script>
import {getBusChange} from "@/api/basic/busTypeChange";
import {inserThrOrderWeb, updateReceive, updateReceiveDetail, delReceiveDetail} from "@/api/thrsys/thrOrderReceive";
import {filterSubByInv, findByFrom, findByUp, findInvByUser} from "@/api/system/invSubWarehouse";
import {filterSubByInv, findByFrom, findByUp, findInvByUser, findLyInv} from "@/api/system/invSubWarehouse";
import dialogInvProduct from "../DialogSelectInvProduct";
import {getOrderDetail} from "@/api/inout/receiveOrder";
import {parseTime} from "@/utils/coTools";
@ -209,8 +210,8 @@ export default {
code: "",
query: {
orderIdFk: "",
page: 1,
limit: 10,
// page: 1,
// limit: 10,
},
formData: {
invCode: null,
@ -258,13 +259,13 @@ export default {
sLoading: false,
busTypes: [],
currentRow: {},
selectedIndex: "",
selectedIndex: null,
selectInvProductVisible: false,
thisData: {},
storageList: [],
invQueryData: {},
type: 1,
Receive: {},
Receive: null,
ischeck: false,
};
},
@ -290,7 +291,7 @@ export default {
let cQuery = {
locInvCode: this.formData.invCode,
};
findByUp(cQuery)
findLyInv(cQuery)
.then((response) => {
this.fromOptions = response.data || [];
if (this.fromOptions != null && this.fromOptions.length > 0) {
@ -420,8 +421,6 @@ export default {
},
save() {
if (this.$isNotBlank(this.Receive)) {
console.log("this.Receive:")
console.log(this.Receive)
this.Receive.targetInvCode = this.formData.targetInvCode
this.Receive.advanceType = this.formData.advanceType
updateReceiveDetail(this.Receive).then(res => {
@ -429,6 +428,7 @@ export default {
this.loading = false;
this.ischeck = false;
this.selectedIndex = null;
this.getOrderDetailList()
this.$message.success('修改成功');
} else {
this.$message.error(res.message);
@ -438,14 +438,18 @@ export default {
}
},
rowChange(val) {
// if(this.Receive!=null){
// this.save()
// }
this.Receive = val;
console.log("var:")
console.log(this.Receive)
this.ischeck = true;
this.currentRow = val;
this.selectedIndex = val.index;
this.iCount = val.count;
this.focusNext('iCount');
// this.focusNext('iCount');
this.getOrderDetailList()
},
tableCountChange(row) {
this.Receive = row;

@ -160,7 +160,7 @@
import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
import auditDetail from "@/views/inout/receive/receiveAuditDetail"
import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
import {filterSub, filterSubAll, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
export default {
data() {
@ -381,8 +381,9 @@ export default {
let query = {
filter: 3,
name: keyWord,
locInvCode: this.$store.getters.locInvCode
};
findInvByUser(query)
findByFrom(query)
.then((response) => {
this.invList = response.data || [];
// if (this.invList.length > 0) {
@ -402,6 +403,7 @@ export default {
},
created() {
this.finCurInv();
this.getList();
},
};

@ -468,6 +468,7 @@ export default {
},
created() {
this.finCurInv();
this.getList();
},
};
</script>

@ -10,7 +10,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="领用仓库:">
<el-select v-model="filterQuery.targetInvCode"
<el-select v-model="filterQuery.invCode"
filterable
clearable
remote
@ -179,7 +179,7 @@
import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
import auditDetail from "@/views/inout/receive/receiveAuditDetail"
import {delReceive} from "@/api/thrsys/thrOrderReceive";
import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
import {filterSub, filterSubAll, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
export default {
data() {
@ -426,9 +426,10 @@ export default {
this.invList = [];
let query = {
name: keyWord,
locInvCode: this.$store.getters.locInvCode,
filter: 3
};
findInvByUser(query)
findByFrom(query)
.then((response) => {
this.invList = response.data || [];
// if (this.invList.length > 0) {
@ -470,6 +471,7 @@ export default {
},
created() {
this.finCurInv();
this.getList();
},
};
</script>

@ -152,7 +152,8 @@ export default {
deptCode: null,
invCode: null,
page: 1,
limit: 10
limit: 10,
price: null,
},
list: [],
total: 0,
@ -167,8 +168,14 @@ export default {
});
this.invPreProductDetailQuery = {
code: null,
relId: null,
supId: null,
batchNo: null,
deptCode: null,
invCode: null,
page: 1,
limit: 10
limit: 10,
price: null,
};
this.getList();
},
@ -206,7 +213,7 @@ export default {
this.invPreProductDetailQuery.batchNo = this.inputQuery.batchNo;
this.invPreProductDetailQuery.deptCode = this.inputQuery.deptCode;
this.invPreProductDetailQuery.invCode = this.inputQuery.invCode;
this.invProductDetailQuery.price = this.inputQuery.price;
this.invPreProductDetailQuery.price = this.inputQuery.price;
// this.invPreProductDetailQuery.nameCode = this.inputQuery.nameCode;
getInvPreInProductDetail(this.invPreProductDetailQuery).then((res) => {

@ -153,6 +153,7 @@ export default {
invCode: null,
page: 1,
limit: 10,
price:null,
defaultSort: {prop: 'orderTime', order: 'desc'},
},
list: [],
@ -167,8 +168,15 @@ export default {
});
this.invPreProductDetailQuery = {
code: null,
relId: null,
supId: null,
batchNo: null,
deptCode: null,
invCode: null,
page: 1,
limit: 10
limit: 10,
price:null,
defaultSort: {prop: 'orderTime', order: 'desc'},
};
this.getList();
},
@ -205,7 +213,7 @@ export default {
this.invPreProductDetailQuery.batchNo = this.inputQuery.batchNo;
this.invPreProductDetailQuery.deptCode = this.inputQuery.deptCode;
this.invPreProductDetailQuery.invCode = this.inputQuery.invCode;
this.invProductDetailQuery.price = this.inputQuery.price;
this.invPreProductDetailQuery.price = this.inputQuery.price;
// this.invPreProductDetailQuery.nameCode = this.inputQuery.nameCode;
getInvPreProductDetail(this.invPreProductDetailQuery).then((res) => {
this.loading = false;

@ -149,6 +149,7 @@ export default {
batchNo: null,
deptCode: null,
invCode: null,
price:null,
page: 1,
limit: 10
},
@ -165,6 +166,12 @@ export default {
});
this.invProductDetailQuery = {
code: null,
relId: null,
supId: null,
batchNo: null,
deptCode: null,
invCode: null,
price:null,
page: 1,
limit: 10
};

@ -38,14 +38,14 @@
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="物品编码:" class="query-form-item">
<el-form-item label="DI/物资编码:" class="query-form-item">
<el-input v-model="listQuery.unionCode" style="width: 100%" placeholder="请输入DI/医保编码/商品条码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品通用名:" class="query-form-item">
<el-input v-model="listQuery.cpmctymc" style="width: 100%" placeholder="请输入产品通用名"
<el-form-item label="物资名称:" class="query-form-item">
<el-input v-model="listQuery.cpmctymc" style="width: 100%" placeholder="请输入物资名称"
clearable="true"></el-input>
</el-form-item>
</el-col>

@ -624,7 +624,8 @@ export default {
}
});
})
.catch(() => {});
.catch(() => {
});
},
toggleExpandAll() {
this.refreshTable = false;
@ -741,7 +742,8 @@ export default {
}
});
})
.catch(() => {});
.catch(() => {
});
},
//

@ -140,7 +140,7 @@
top="5vh"
>
<el-form :model="subData" ref="dataForm" :rules="formRules" label-width="130px">
<el-row :gutter="20" class="el-row" type="flex">
<el-row :gutter="20" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="所属部门" prop="parentId">
<el-select v-model="subData.parentId" placeholder="顶级" style="width: 80%">
@ -168,8 +168,6 @@
</treeselect>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="仓库编码" prop="code" class="query-form-item">
<el-input
@ -188,8 +186,6 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="仓库类型" prop="advanceType">
<el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型"
@ -207,7 +203,6 @@
<!-- </el-radio-group>-->
<!--</el-form-item>-->
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="是否能被供应商使用" prop="spUse" class="query-form-item">
<el-radio-group v-model="subData.spUse">
@ -216,11 +211,15 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row class="el-row" type="flex">
<el-col class="el-col">
<el-col :span="12" class="el-col">
<el-form-item label="是否领用仓库" prop="lyInvType" class="query-form-item">
<el-radio-group v-model="subData.lyInvType">
<el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col class="el-col" :span="24">
<el-form-item label="备注" prop="remark" class="query-form-item">
<el-input
v-model="subData.remark"
@ -267,13 +266,15 @@
</el-table>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button>
<el-button
type="primary"
@click.native="forInvSubmit()"
>提交
</el-button
>
<el-button @click.native="hideForm">取消</el-button>
</div>
</el-dialog>
<!-- 仓库关联第三方分库对话框-->

@ -23,9 +23,9 @@
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
v-hasPermi="['system:menu:query']">查询
>查询
</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']"
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
>新增
</el-button>
<el-button type="primary" icon="el-icon-sort" size="mini" @click="toggleExpandAll">/</el-button>
@ -79,28 +79,25 @@
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime">
<el-table-column label="创建时间" prop="createTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" fixed="right" width="140">
<template slot-scope="scope">
<el-button
type="text"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:menu:edit']"
>编辑
</el-button>
<el-button
type="text"
v-hasPermi="['system:menu:add']"
@click="handleAdd(scope.row)"
>新增
</el-button>
<el-button
type="text"
v-hasPermi="['system:menu:delete']"
@click="handleDelete(scope.row)"
>删除
</el-button>

Loading…
Cancel
Save