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

领用相关问题修改

Browse Source
20231126-yw
anthonywj 2 years ago
parent 499779d04f
commit 3e45eca2fd
16 changed files with 295 additions and 219 deletions
Show Stats Download Patch File Download Diff File

4
.env.production
Unescape Escape View File

@ -8,7 +8,7 @@ ENV = 'production'
#林纪裕cd #林纪裕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://www.linjiyu.lol:83/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/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://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/'
# 吴总测试服务器. # 吴总测试服务器.

9
src/api/system/invSubWarehouse.js
Unescape Escape View File

@ -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) { export function filterSubByInv(query) {
return axios({ return axios({
url: "/spms/inv/warehouse/findByUser", url: "/spms/inv/warehouse/findByUser",

95
src/views/inout/DialogSelectInvProduct.vue
Unescape Escape View File

@ -4,13 +4,13 @@
<el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="产品标识DI:"> <el-form-item label="DI/物资编码:">
<el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入产品标识DI"></el-input> <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入DI/物资编码"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="产品名称:"> <el-form-item label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品名称"></el-input> <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -23,6 +23,33 @@
<el-input v-model="filterQuery.batchNo" style="width: 90%" placeholder="请输入批次号"></el-input> <el-input v-model="filterQuery.batchNo" style="width: 90%" placeholder="请输入批次号"></el-input>
</el-form-item> </el-form-item>
</el-col> </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-row>
</el-form> </el-form>
@ -38,21 +65,22 @@
<el-divider style="margin: 15px"></el-divider> <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 type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode"></el-table-column> <el-table-column label="DI/物资编码" prop="nameCode" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc"></el-table-column> <el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column> <el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column> <el-table-column label="批次号" prop="batchNo" width="90"></el-table-column>
<el-table-column label="生产日期" prop="productionDate"></el-table-column> <el-table-column label="生产日期" prop="productionDate" width="90"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column> <el-table-column label="失效日期" prop="expireDate" width="90"></el-table-column>
<el-table-column label="入库数量" prop="inCount"></el-table-column> <el-table-column label="入库数量" prop="inCount" width="90"></el-table-column>
<el-table-column label="出库数量" prop="outCount"></el-table-column> <el-table-column label="出库数量" prop="outCount" width="90"></el-table-column>
<el-table-column label="结余数量" prop="reCount"></el-table-column> <el-table-column label="结余数量" prop="reCount" width="90"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" width="200"></el-table-column> <el-table-column label="生产企业" prop="ylqxzcrbarmc" width="180"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="200"></el-table-column> <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
<el-table-column label="供应商" prop="supName" width="260"></el-table-column> <el-table-column label="供应商" prop="supName" width="180"></el-table-column>
</el-table> </el-table>
</el-card> </el-card>
@ -74,6 +102,7 @@ import {addDetail} from "@/api/inout/receiveOrder";
import {addBizProduct} from "@/api/inout/orderDetailCode"; import {addBizProduct} from "@/api/inout/orderDetailCode";
import {getInvPreInProduct, getInvPreInProductStock} from "@/api/inventory/invPreInSearch"; import {getInvPreInProduct, getInvPreInProductStock} from "@/api/inventory/invPreInSearch";
import {getInvPreProduct, getInvPreProductStock} from "@/api/inventory/invPreProduct"; import {getInvPreProduct, getInvPreProductStock} from "@/api/inventory/invPreProduct";
import {finProductSet} from "@/api/param/systemParamConfig";
export default { export default {
@ -130,6 +159,7 @@ export default {
idQuery: null, idQuery: null,
showSup: false, showSup: false,
fromOptions: [], fromOptions: [],
productRemarkSet: {},
}; };
}, },
components: {}, components: {},
@ -173,7 +203,7 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
//寄售 //寄售
if(this.invQueryData.advanceType==3){ if (this.invQueryData.advanceType == 3) {
getInvPreProductStock(this.filterQuery) getInvPreProductStock(this.filterQuery)
.then((response) => { .then((response) => {
this.showSup = response.data.showSup; this.showSup = response.data.showSup;
@ -187,7 +217,7 @@ export default {
this.total = 0; this.total = 0;
}); });
//预验收 //预验收
}else if(this.invQueryData.advanceType==2){ } else if (this.invQueryData.advanceType == 2) {
getInvPreInProductStock(this.filterQuery) getInvPreInProductStock(this.filterQuery)
.then((response) => { .then((response) => {
this.showSup = response.data.showSup; this.showSup = response.data.showSup;
@ -201,7 +231,7 @@ export default {
this.total = 0; this.total = 0;
}); });
}else{ } else {
getInvProductStock(this.filterQuery) getInvProductStock(this.filterQuery)
.then((response) => { .then((response) => {
this.showSup = response.data.showSup; this.showSup = response.data.showSup;
@ -226,16 +256,16 @@ export default {
return; return;
} }
var idster = []; var idster = [];
if(this.codeArray != null || this.codeArray!=undefined ){ if (this.codeArray != null || this.codeArray != undefined) {
if(this.codeArray.length>0){ if (this.codeArray.length > 0) {
for(var i=0;i<this.codeArray.length;i++){ for (var i = 0; i < this.codeArray.length; i++) {
idster.push(this.codeArray[i].relIdFk); idster.push(this.codeArray[i].relIdFk);
} }
} }
if(idster.length>0){ if (idster.length > 0) {
for(var i=0;i<idster.length;i++){ for (var i = 0; i < idster.length; i++) {
for(var j=0;j<selection.length;j++){ for (var j = 0; j < selection.length; j++) {
if(idster[i]==selection[j].relIdFk){ if (idster[i] == selection[j].relIdFk) {
this.$message.error("该产品已录入！"); this.$message.error("该产品已录入！");
return return
} }
@ -293,8 +323,14 @@ export default {
this.loading = false; this.loading = false;
}); });
} }
},
findBasicProductSet() {
finProductSet().then((response) => {
if (response.code == 20000) {
this.productRemarkSet = response.data;
}
});
}, },
}, },
filters: { filters: {
@ -313,6 +349,7 @@ export default {
}; };
}, },
created() { created() {
this.findBasicProductSet();
this.filterQuery.invCode = this.invQueryData.targetInvCode; this.filterQuery.invCode = this.invQueryData.targetInvCode;
// 加载表格数据 // 加载表格数据
this.getList(); this.getList();

55
src/views/inout/DialogSelectReceiveOrder.vue
Unescape Escape View File

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

2
src/views/inout/IoCreateBusOrder.vue
Unescape Escape View File

@ -175,7 +175,7 @@
>删除 >删除
</el-button </el-button
> >
<!-- <el-button--> <!-- <el-button-->
<!-- type="text"--> <!-- type="text"-->
<!-- size="small"--> <!-- size="small"-->
<!-- v-if="scope.row.status == 1"--> <!-- v-if="scope.row.status == 1"-->

34
src/views/inout/receive/DialogNewReceive.vue
Unescape Escape View File

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

6
src/views/inout/receive/receiveAudit.vue
Unescape Escape View File

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

1
src/views/inout/receive/receiveMySearch.vue
Unescape Escape View File

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

8
src/views/inout/receive/receiveSearch.vue
Unescape Escape View File

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

13
src/views/inventory/InvPreInProductsDetail.vue
Unescape Escape View File

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

12
src/views/inventory/InvPreProductsDetail.vue
Unescape Escape View File

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

7
src/views/inventory/InvProductsDetail.vue
Unescape Escape View File

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

6
src/views/purchase/purApply/purOrderSelectProduct.vue
Unescape Escape View File

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

26
src/views/system/dept/authDept.vue
Unescape Escape View File

@ -80,7 +80,7 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" prop="remark"> </el-table-column> <el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -250,7 +250,7 @@
prop="employeeName" prop="employeeName"
></el-table-column> ></el-table-column>
<el-table-column label="用户账号" prop="userName"></el-table-column> <el-table-column label="用户账号" prop="userName"></el-table-column>
<el-table-column label="备注" prop="comments"> </el-table-column> <el-table-column label="备注" prop="comments"></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -322,7 +322,7 @@
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="仓库名称" prop="name"></el-table-column> <el-table-column label="仓库名称" prop="name"></el-table-column>
<el-table-column label="仓库编码" prop="code"></el-table-column> <el-table-column label="仓库编码" prop="code"></el-table-column>
<el-table-column label="备注" prop="remark"> </el-table-column> <el-table-column label="备注" prop="remark"></el-table-column>
<!-- <el-table-column label="操作">--> <!-- <el-table-column label="操作">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-button--> <!-- <el-button-->
@ -354,11 +354,11 @@ import {
saveWarehouse, saveWarehouse,
} from "@/api/system/invWarehouse"; } from "@/api/system/invWarehouse";
import { treeList, treeSelectedList } from "@/api/system/dataStatus"; import {treeList, treeSelectedList} from "@/api/system/dataStatus";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { listDeptUser, removeUser } from "@/api/system/deptUser"; import {listDeptUser, removeUser} from "@/api/system/deptUser";
import { filterSubAll } from "@/api/system/invSubWarehouse"; import {filterSubAll} from "@/api/system/invSubWarehouse";
export default { export default {
data() { data() {
@ -388,9 +388,9 @@ export default {
deptOptions: [], deptOptions: [],
rules: { rules: {
name: [ name: [
{ required: true, message: "部门名称不能为空", trigger: "blur" }, {required: true, message: "部门名称不能为空", trigger: "blur"},
], ],
status: [{ required: true, message: "状态不能为空", trigger: "blur" }], status: [{required: true, message: "状态不能为空", trigger: "blur"}],
}, },
menuExpand: false, menuExpand: false,
menuNodeAll: false, menuNodeAll: false,
@ -624,7 +624,8 @@ export default {
} }
}); });
}) })
.catch(() => {}); .catch(() => {
});
}, },
toggleExpandAll() { toggleExpandAll() {
this.refreshTable = false; this.refreshTable = false;
@ -662,7 +663,7 @@ export default {
}); });
}, },
getDeptStatusMenuTreeselect(deptId) { getDeptStatusMenuTreeselect(deptId) {
let query = { deptId: deptId }; let query = {deptId: deptId};
return treeSelectedList(query).then((response) => { return treeSelectedList(query).then((response) => {
this.menuOptions = response.data.menus; this.menuOptions = response.data.menus;
return response; return response;
@ -741,7 +742,8 @@ export default {
} }
}); });
}) })
.catch(() => {}); .catch(() => {
});
}, },
//仓库相关 //仓库相关
@ -762,7 +764,7 @@ export default {
this.getInvList(); this.getInvList();
}, },
}, },
components: { Treeselect }, components: {Treeselect},
mounted() { mounted() {
}, },
created() { created() {

37
src/views/system/dept/invWarehouse.vue
Unescape Escape View File

@ -140,7 +140,7 @@
top="5vh" top="5vh"
> >
<el-form :model="subData" ref="dataForm" :rules="formRules" label-width="130px"> <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-col :span="12" class="el-col">
<el-form-item label="所属部门" prop="parentId"> <el-form-item label="所属部门" prop="parentId">
<el-select v-model="subData.parentId" placeholder="顶级" style="width: 80%"> <el-select v-model="subData.parentId" placeholder="顶级" style="width: 80%">
@ -168,8 +168,6 @@
</treeselect> </treeselect>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="仓库编码" prop="code" class="query-form-item"> <el-form-item label="仓库编码" prop="code" class="query-form-item">
<el-input <el-input
@ -188,8 +186,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="仓库类型" prop="advanceType"> <el-form-item label="仓库类型" prop="advanceType">
<el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型" <el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型"
@ -207,7 +203,6 @@
<!-- </el-radio-group>--> <!-- </el-radio-group>-->
<!--</el-form-item>--> <!--</el-form-item>-->
</el-col> </el-col>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="是否能被供应商使用" prop="spUse" class="query-form-item"> <el-form-item label="是否能被供应商使用" prop="spUse" class="query-form-item">
<el-radio-group v-model="subData.spUse"> <el-radio-group v-model="subData.spUse">
@ -216,11 +211,15 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <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-row class="el-row" type="flex"> <el-radio :label="true">是</el-radio>
<el-col class="el-col"> <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-form-item label="备注" prop="remark" class="query-form-item">
<el-input <el-input
v-model="subData.remark" v-model="subData.remark"
@ -267,13 +266,15 @@
</el-table> </el-table>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button>
<el-button <el-button
type="primary" type="primary"
@click.native="forInvSubmit()" @click.native="forInvSubmit()"
>提交 >提交
</el-button </el-button
> >
<el-button @click.native="hideForm">取消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 仓库关联第三方分库对话框--> <!-- 仓库关联第三方分库对话框-->
@ -453,7 +454,7 @@ export default {
] ]
}, },
subData: {}, subData: {},
subDataType:{}, subDataType: {},
fromDeptOptions: [], fromDeptOptions: [],
invOptions: [], invOptions: [],
thirdSubQuery: { thirdSubQuery: {
@ -492,7 +493,7 @@ export default {
name: "", name: "",
status: "", status: "",
}; };
this.subDataType.advanceType=null; this.subDataType.advanceType = null;
this.getList(); this.getList();
//置空用户列表和货位信息列表的参数 //置空用户列表和货位信息列表的参数
@ -504,13 +505,13 @@ export default {
invName: null invName: null
}; };
}, },
onResetintent(){ onResetintent() {
this.$router.push({ this.$router.push({
path: "", path: "",
}); });
this.thirdSubQuery = { this.thirdSubQuery = {
thirdSysFk: this.thirdSubQuery.thirdSysFk, thirdSysFk: this.thirdSubQuery.thirdSysFk,
page:1, page: 1,
limit: 10 limit: 10
} }
@ -531,7 +532,7 @@ export default {
}, },
onSubmit() { //提交查询 onSubmit() { //提交查询
this.query.advanceType=this.subDataType.advanceType; this.query.advanceType = this.subDataType.advanceType;
this.getList(); this.getList();
}, },
@ -609,7 +610,7 @@ export default {
}, },
hideForm() { // 新增，编辑---取消 hideForm() { // 新增，编辑---取消
this.query.advanceType=null; this.query.advanceType = null;
this.formVisible = false; this.formVisible = false;
this.subFormVisible = false; this.subFormVisible = false;
this.resetForm(); this.resetForm();

11
src/views/system/menu/index.vue
Unescape Escape View File

@ -23,9 +23,9 @@
<el-button-group> <el-button-group>
<el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <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" <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
v-hasPermi="['system:menu:query']">查询 >查询
</el-button> </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>
<el-button type="primary" icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</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"/> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime"> <el-table-column label="创建时间" prop="createTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:menu:edit']"
>编辑 >编辑
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
v-hasPermi="['system:menu:add']"
@click="handleAdd(scope.row)" @click="handleAdd(scope.row)"
>新增 >新增
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
v-hasPermi="['system:menu:delete']"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除 >删除
</el-button> </el-button>

Write Preview
Loading…
Cancel
Save