Merge remote-tracking branch 'origin/master'

prod
郑明梁 2 years ago
commit 4de861a0f2

@ -184,6 +184,14 @@ export function changeVersion(query) {
});
}
export function getGgxhList(params) {
return axios({
url: "/udiwms/udiinfo/getGgxhList",
method: "get",
params: params
});
}

@ -8,6 +8,15 @@ export function saveCode(query) {
});
}
export function tabCode(query) {
return axios({
url: "/warehouse/inout/saveTabCode",
method: "post",
data: query
});
}
export function findByCode(query) {
return axios(
{

@ -130,7 +130,7 @@
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.cplb"
v-model="editQuery.hchzsb"
></el-input>
</div>
</el-col>
@ -196,7 +196,7 @@
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.qxlb"
v-model="editQuery.cplx"
></el-input>
</div>
</el-col>

@ -221,7 +221,7 @@
:closeCodeDialog="closeCodeDialog"
:repeatAddCode="repeatAddCode"
:codeDetail="codeFormData"
editTye="1">
editType="1">
</editCodeDialog>
</el-dialog>
@ -399,7 +399,8 @@ export default {
.then((response) => {
this.busTypeOptions = response.data || [];
this.curAction = this.getActionItem(this.orderFormData.action);
if ((this.curAction.checkEnable && this.curAction.checkWebNew) || this.viewType == 1) {
if ((this.curAction.checkEnable && (this.curAction.checkWebNew || this.curAction.checkUdims || this.curAction.checkCopy
|| this.curAction.checkPdaEd || this.curAction.checkPdaUn || this.curAction.checkPc || this.curAction.checkWebNew || this.curAction.checkSp || this.curAction.checkChange || this.curAction.checkBalance)) || this.viewType == 1) {
this.bizShow = true;
} else
this.bizShow = false;

@ -18,7 +18,7 @@
<el-input v-model="editData.produceDate" auto-complete="off"
oninput="if(value.length>6)value=value.slice(0,6)"
type="number"
:disabled="false"></el-input>
:disabled="editType!=1"></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
@ -26,19 +26,19 @@
<el-input v-model="editData.expireDate" auto-complete="off"
oninput="if(value.length>6)value=value.slice(0,6)"
type="number"
:disabled="false"></el-input>
:disabled="editType!=1"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="11">
<el-form-item prop="batchNo" label="批次号">
<el-input v-model="editData.batchNo" auto-complete="off" :disabled="false"></el-input>
<el-input v-model="editData.batchNo" auto-complete="off" :disabled="editType!=1"></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item prop="serialNo" label="序列号">
<el-input v-model="editData.serialNo" auto-complete="off"></el-input>
<el-input v-model="editData.serialNo" auto-complete="off" :disabled="editType!=1"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -72,13 +72,13 @@
import {
findByCode,
saveCode
saveCode, tabCode
} from "@/api/inout/code";
export default {
name: "editCode",
props: {
editTye: {
editType: {
type: Object,
required: true,
},
@ -106,8 +106,20 @@ export default {
methods: {
saveCode() {
if (this.editTye == 1) {
if (this.editType == 1) {
this.repeatAddCode(this.editData);
tabCode(this.editData)
.then((response) => {
console.log(response)
if (response.code === 20000) {
this.$message.success("提交成功");
} else {
this.$message.error(response.message);
}
this.loading = false;
});
} else {
saveCode(this.editData)
.then((response) => {

@ -148,7 +148,7 @@
v-if="editCodeVisible"
>
<editCodeDialog
editTye="2"
editType="2"
:closeCodeDialog="closeCodeDialog"
:codeDetail="codeDetail">
</editCodeDialog>
@ -314,6 +314,7 @@ export default {
this.$message.success("绑定成功");
this.idQuery.id = this.curRow.orderId;
this.getCodeList();
this.refreshPanel();
} else {
this.$message.error(response.message);
}
@ -325,7 +326,7 @@ export default {
closeBindDialog() {
this.selectRlVisible = false;
this.dialogTableVisible = false;
this.refreshPanel();
// this.refreshPanel();
},
closeCodeDialog() {

@ -690,7 +690,7 @@ export default {
},
created() {
this.getDeptList();
if (isBlank(this.deviceReceiveOrder) ) {
if (!(isBlank(this.deviceReceiveOrder.orderId)) ) {
this.formData.orderId = this.deviceReceiveOrder.orderId;
this.formData.createTime = this.deviceReceiveOrder.createTime;
this.formData.fromDeptCode = this.deviceReceiveOrder.fromDeptCode;

@ -1,75 +1,183 @@
<template>
<div>
<el-card class="el-card">
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-row>
<el-form-item class="query-form-item" label="产品名称:">
<el-input v-model="filterQuery.productName" placeholder="参数关键字搜索" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item" label="仓库名称:">
<el-input v-model="filterQuery.productName" placeholder="参数关键字搜索" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item" label="货位名称:">
<el-input v-model="filterQuery.productName" placeholder="参数关键字搜索" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary"
@click.native="search"
icon="el-icon-search">
搜索
</el-button>
</el-button-group>
</el-form-item>
<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="invSpaceChange"
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-autocomplete
class="inline-input"
style="width: 90%"
v-model="queryName"
:fetch-suggestions="queryProductName"
placeholder="请输入内容"
clearable
@select="handleSelect"
@clear="clearQueryProduct"
></el-autocomplete>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="规格型号:">
<el-select v-model="filterQuery.ggxh" placeholder="请选择" style="width: 90%">
<el-option
v-for="item in ggxhList"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</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.batchNo" placeholder="批次号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="状态:">
<el-select v-model="filterQuery.status"
placeholder="请选择消息状态"
clearable
style="width: 90%"
>
<el-option label="未确认" :value="1"></el-option>
<el-option label="已确认" :value="2"></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.ignoreStatus"
placeholder="请选择消息忽略状态"
clearable
style="width: 90%"
>
<el-option label="不忽略" :value="0"></el-option>
<el-option label="忽略7天" :value="1"></el-option>
<el-option label="忽略15天" :value="2"></el-option>
<el-option label="忽略30天" :value="3"></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
style="width: 90%"
>
<el-option label="库存不足预警" :value="1"></el-option>
<el-option label="负库存预警" :value="2"></el-option>
<el-option label="库存积压预警" :value="3"></el-option>
<el-option label="库存过期预警" :value="4"></el-option>
<el-option label="近效期预警" :value="5"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" border>
<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" @click.native="search" icon="el-icon-search">搜索</el-button>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="300" show-overflow-tooltip></el-table-column>
<el-table-column label="仓库名称" prop="invName" width="200"></el-table-column>
<el-table-column label="货位名称" prop="invSpaceName" width="200"></el-table-column>
<el-table-column label="低库存预警" prop="lowStock" width="100">
<template slot-scope="scope">
<el-tag>{{enableMap[scope.row.lowStock]}}</el-tag>
</template>
</el-table-column>
<el-table-column label="低库存预警数量" prop="lowStockNum" width="150"></el-table-column>
<el-table-column label="负库存预警" prop="lackStock" width="100">
<template slot-scope="scope">
<el-tag>{{enableMap[scope.row.lackStock]}}</el-tag>
</template>
</el-table-column>
<el-table-column label="积压预警" prop="overStock" width="100">
<el-table-column label="产品名称" prop="productName" width="300" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="300" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="300" show-overflow-tooltip></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="supName" width="120"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" width="120"></el-table-column>
<el-table-column label="批准文号" prop="zczbhhzbapzbh" width="120"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="100"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="100"></el-table-column>
<el-table-column label="库存数量" prop="productionDate" width="100"></el-table-column>
<el-table-column label="消息状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag>{{enableMap[scope.row.overStock]}}</el-tag>
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="积压预警数量" prop="overStockNum" width="150"></el-table-column>
<el-table-column label="过期提醒" prop="invSpaceName" width="100">
<el-table-column label="忽略预警" prop="ignoreStatus" width="100">
<template slot-scope="scope">
<el-tag>{{enableMap[scope.row.expireDate]}}</el-tag>
<el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="近效期提醒" prop="recentDate" width="100">
<el-table-column label="预警类型" prop="productionDate" width="100">
<template slot-scope="scope">
<el-tag>{{enableMap[scope.row.recentDate]}}</el-tag>
<el-tag>{{ typeMap[scope.row.type] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="近效期预警天数" prop="recentDateDay" width="150"></el-table-column>
<el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
<el-table-column label="预警内容" prop="msg" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="处理方式" prop="handleMsg" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="备注" prop="remark" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native="handleForm(scope.$index, scope.row)"
>编辑
@click.native="confirmMsg(scope.row)"
>确认
</el-button>
<el-button
type="text"
size="small"
@click.native="handleForm(scope.$index, scope.row)"
>删除
@click.native="ignoreMsg(scope.row)"
>忽略
</el-button>
</template>
</el-table-column>
@ -81,99 +189,31 @@
:limit.sync="filterQuery.limit"
@pagination="getList"
/>
<!--表单-->
<el-dialog
:title="formMap[formName]"
:visible.sync="formVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="hideForm"
width="45%"
top="5vh"
>
<el-form :model="formData" :rules="formRules" ref="dataForm">
<el-row>
<el-form-item label="参数名:" prop="name" label-width="100px">
<el-input
v-model="formData.name"
auto-complete="off"
:disabled="true"
style="width: 90%"
></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="参数键:" prop="key" label-width="100px">
<el-input
v-model="formData.key"
auto-complete="off" style="width: 90%"
:disabled="true"
></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="参数值" prop="value" label-width="100px">
<el-input type="" v-model="formData.value" auto-complete="off" style="width: 90%"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item class="query-form-item" label="提醒类型:" label-width="100px">
<el-select v-model="formData.type" placeholder="请选择提醒类型" style="width: 90%" disabled>
<el-option label="" value="0"></el-option>
<el-option label="库存预警" :value="1"></el-option>
<el-option label="过期提醒" :value="2"></el-option>
<el-option label="近效期提醒" :value="3"></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="参数说明:" label-width="100px">
<el-input
type="textarea"
v-model="formData.remark" style="width: 90%"
:disabled="true"
></el-input>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button>
<el-button type="primary" @click.native="formSubmit()" :loading="formLoading"
>提交
</el-button>
</div>
</el-dialog>
</el-card>
</div>
</template>
<script>
import {
systemParamConfigList,
systemParamConfigSave,
} from "@/api/system/param/systemParamConfig";
import {getInvRemindMsgList} from "@/api/system/invRemindMsg";
import {getInvRemindMsgList, confirmMsg, ignoreMsg} from "@/api/system/invRemindMsg";
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import {filterProductNames} from "@/api/inventory/invPorduct";
import {getGgxhList} from "@/api/basic/product/udiRelevance";
const formJson = {
id: "",
name: "",
key: "",
value: "",
type: null,
remark: "",
};
export default {
name: "remindSet",
name: "invRemindMsg",
data() {
return {
showSearch: true,
filterQuery: {
relId: null,
batchNo: null,
ggxh: null,
status: 1,
ignoreStatus: 0,
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
type: null,
page: 1,
limit: 20,
},
@ -181,36 +221,29 @@ export default {
total: 0,
loading: true,
index: null,
formName: null,
formMap: {
add: "新增提醒设置",
update: "提醒设置-编辑",
},
formLoading: false,
formVisible: false,
formData: formJson,
formRules: {
paramValue: [{required: true, message: "请输入参数值", trigger: "blur"}],
// ,
// paramStatus: [
// {required: true, message: "", trigger: "change"}
// ]
},
typeMap: {
1: "库存预警",
2: "过期提醒",
3: "近效期提醒",
1: "库存不足预警",
2: "负库存预警",
3: "库存积压预警",
4: "库存过期预警",
5: "近效期预警"
},
enableMap: {
true: "开启",
false: "关闭"
ignoreStatusMap: {
0: "不忽略",
1: "忽略7天",
2: "忽略15天",
3: "忽略30天"
},
deleteLoading: false,
queryName: null,
invList: [],
spaceList: [],
ggxhList: []
};
},
methods: {
hideSearch() {
this.showSearch = !this.showSearch;
},
onReset() {
this.$router.push({
path: "",
@ -245,93 +278,89 @@ export default {
this.total = 0;
});
},
//
resetForm() {
if (this.$refs["dataForm"]) {
//
this.$refs["dataForm"].clearValidate();
//
this.$refs["dataForm"].resetFields();
this.getList();
}
invChange() {
this.spaceList = [];
this.filterQuery.invSpaceCode = null;
this.getSpaceList();
this.getList();
},
//
hideForm() {
//
this.formVisible = !this.formVisible;
return true;
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
this.getSpaceList();
this.getList();
})
.catch(() => {
});
},
//
handleForm(index, row) {
this.formVisible = true;
this.formData = JSON.parse(JSON.stringify(formJson));
if (row !== null) {
this.formData = Object.assign({}, row);
}
this.formName = "add";
if (index !== null) {
this.index = index;
this.formName = "update";
getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
})
},
invSpaceChange() {
this.clearProduct();
let params = {
cpmctymc: this.filterQuery.cpmctymc,
invCode: this.filterQuery.invCode,
invSpaceCode: this.filterQuery.invSpaceCode
};
filterProductNames(params).then((res) => {
this.productList = res.data.list || [];
})
},
clearProduct() {
this.filterQuery.relId = null;
this.queryName = null;
this.filterQuery.ggxh = null;
this.ggxhList = [];
this.productList = null;
},
queryProductName(productName, cb) {
let params = {
cpmctymc: productName,
invCode: this.filterQuery.invCode,
invSpaceCode: this.filterQuery.invSpaceCode
};
filterProductNames(params).then((res) => {
let productList = res.data.list || [];
let results = productName ? productList.filter(this.createFilter(productName)) : productList;
let rs = [];
results.forEach(item => {
let data = {value: item.cpmctymc, relId: item.relIdFk}
rs.push(data);
});
cb(rs);
})
},
createFilter(queryString) {
return (productList) => {
return productList.cpmctymc.toLowerCase().indexOf(queryString.toLowerCase()) === 0;
}
},
formSubmit() {
// if (!Number.isInteger(parseInt(this.formData.paramValue))) {
// this.$message.warning("");
// return;
// }
this.$refs["dataForm"].validate((valid) => {
if (valid) {
this.formLoading = true;
let data = Object.assign({}, this.formData);
data.paramValue = data.paramValue.trim();
systemParamConfigSave(data, this.formName)
.then((response) => {
this.formLoading = false;
if (response.code != 20000) {
this.$message.error(response.message);
return false;
}
this.$message.success("操作成功");
this.formVisible = false;
if (this.formName === "add") {
//
if (response.data && response.data.id) {
data.id = response.data.id;
this.list.unshift(data);
}
} else {
this.list.splice(this.index, 1, data);
}
//
this.resetForm();
this.getList();
})
.catch(() => {
this.formLoading = false;
});
}
handleSelect(item) {
this.queryName = item.value;
this.filterQuery.relId = item.relId;
let params = {relId: item.relId};
getGgxhList(params).then((res) => {
this.ggxhList = res.data || [];
});
},
},
filters: {
paramStatusFilterType(paramStatus) {
const paramStatusMap = {
0: "gray",
1: "success",
};
return paramStatusMap[paramStatus];
clearQueryProduct() {
this.queryName = null;
this.filterQuery.relId = null;
},
paramStatusFilterName(paramStatus) {
const paramStatusMap = {
0: "禁用",
1: "正常",
};
return paramStatusMap[paramStatus];
confirmMsg(row) {
},
ignoreMsg(row) {
},
},
mounted() {
},
created() {
this.getInvList();
//
this.getList();
},

@ -2,79 +2,83 @@
<div>
<el-card class="el-card">
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-row>
<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-form-item class="query-form-item" label="货位:">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
@change="invSpaceChange"
>
<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-form-item class="query-form-item" label="产品名称:">
<el-input v-model="filterQuery.productName" placeholder="" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" @click.native="search" icon="el-icon-search">搜索</el-button>
<el-button type="primary" @click.native="addSet" icon="el-icon-plus">新增库存预警设置</el-button>
</el-button-group>
</el-form-item>
</el-row>
<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-form-item class="query-form-item" label="货位:">
<el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
@change="invSpaceChange"
>
<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-form-item class="query-form-item" label="产品名称:">
<el-autocomplete
class="inline-input"
v-model="queryName"
:fetch-suggestions="queryProductName"
placeholder="请输入内容"
clearable
@select="handleSelect"
@clear="clearQueryProduct"
></el-autocomplete>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" @click.native="search" icon="el-icon-search">搜索</el-button>
<el-button type="primary" @click.native="addSet" icon="el-icon-plus">新增库存预警设置</el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 120%" border>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="300" show-overflow-tooltip></el-table-column>
<el-table-column label="仓库名称" prop="invName" width="200"></el-table-column>
<el-table-column label="货位名称" prop="invSpaceName" width="200"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="300" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="300" show-overflow-tooltip></el-table-column>
<el-table-column label="低库存预警" prop="lowStock" width="120">
<template slot-scope="scope">
<el-tag>{{ enableMap[scope.row.lowStock] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="低库存预警数量" prop="lowStockNum" width="150"></el-table-column>
<el-table-column label="负库存预警" prop="lackStock" width="120">
<template slot-scope="scope">
<el-tag>{{ enableMap[scope.row.lackStock] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="积压预警" prop="overStock" width="120">
<el-table-column label="库存积压预警" prop="overStock" width="120">
<template slot-scope="scope">
<el-tag>{{ enableMap[scope.row.overStock] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="积压预警数量" prop="overStockNum" width="150"></el-table-column>
<el-table-column label="过期提醒" prop="invSpaceName" width="120">
<el-table-column label="库存产品过期预警" prop="invSpaceName" width="180">
<template slot-scope="scope">
<el-tag>{{ enableMap[scope.row.expireDate] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="近效期提醒" prop="recentDate" width="120">
<el-table-column label="近效期预警" prop="recentDate" width="120">
<template slot-scope="scope">
<el-tag>{{ enableMap[scope.row.recentDate] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="近效期预警天数" prop="recentDateDay" width="150"></el-table-column>
<el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="120">
<template slot-scope="scope">
@ -103,22 +107,20 @@
<!--表单-->
<el-dialog
v-if="formVisible"
:title="formMap[formName]"
:visible.sync="formVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="hideForm"
width="45%"
:before-close="closeDialog"
width="60%"
top="5vh"
>
<el-form :model="formData" ref="dataForm">
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button>
<el-button type="primary" @click.native="formSubmit()" :loading="formLoading"
>提交
</el-button>
</div>
<invRemindSetModify
:invRemindSetData="formData"
:closeDialog="closeDialog"
:formName="formName"
></invRemindSetModify>
</el-dialog>
</el-card>
</div>
@ -133,22 +135,13 @@ import {
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import {filterProductNames} from "@/api/inventory/invPorduct";
import invRemindSetModify from "@/views/remind/invRemindSetModify.vue";
const formJson = {
id: "",
name: "",
key: "",
value: "",
type: null,
remark: "",
};
export default {
name: "invRemindSet",
data() {
return {
filterQuery: {
cpmctymc: null,
relId: null,
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
@ -166,7 +159,20 @@ export default {
},
formLoading: false,
formVisible: false,
formData: null,
formData: {
id: null,
relId: null,
ggxh: null,
deptCode: this.$store.getters.locDeptCode,
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
lowStock: false,
lackStock: false,
overStock: false,
expireDate: false,
recentDate: false,
remark: null
},
enableMap: {
true: "开启",
false: "关闭"
@ -174,7 +180,8 @@ export default {
deleteLoading: false,
invList: [],
spaceList: [],
productList: []
queryName: null,
};
},
methods: {
@ -225,41 +232,24 @@ export default {
}
},
addSet() {
this.formData = {};
this.formData = {
id: null,
relId: null,
ggxh: null,
deptCode: this.$store.getters.locDeptCode,
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
lowStock: false,
lackStock: false,
overStock: false,
expireDate: false,
recentDate: false,
remark: null
};
this.formName = "add";
this.formVisible = true;
},
//
hideForm() {
//
this.formVisible = !this.formVisible;
return true;
},
//
handleForm(index, row) {
this.formData = row;
this.formName = "edit";
this.formVisible = true;
},
formSubmit() {
this.formLoading = true;
let data = Object.assign({}, this.formData);
data.paramValue = data.paramValue.trim();
saveInvRemindSet(data, this.formName)
.then((response) => {
this.formLoading = false;
if (response.code != 20000) {
this.$message.error(response.message);
return false;
}
this.$message.success("操作成功");
this.formVisible = false;
this.resetForm();
})
.catch(() => {
this.formLoading = false;
});
},
deleteSet(id) {
this.$confirm('是否确认删除此库存预警设置, 是否继续?', '提示', {
confirmButtonText: '确定',
@ -310,6 +300,63 @@ export default {
this.productList = res.data.list || [];
})
},
queryProductName(productName, cb) {
let params = {
cpmctymc: productName,
invCode: this.filterQuery.invCode,
invSpaceCode: this.filterQuery.invSpaceCode
};
filterProductNames(params).then((res) => {
let productList = res.data.list || [];
let results = productName ? productList.filter(this.createFilter(productName)) : productList;
let rs = [];
results.forEach(item => {
let data = {value: item.cpmctymc, relId: item.relIdFk}
rs.push(data);
});
cb(rs);
})
},
createFilter(queryString) {
return (productList) => {
return productList.cpmctymc.toLowerCase().indexOf(queryString.toLowerCase()) === 0;
}
},
handleSelect(item) {
this.queryName = item.value;
this.filterQuery.relId = item.relId;
},
clearQueryProduct() {
this.queryName = null;
this.filterQuery.relId = null;
},
closeDialog() {
this.formVisible = false;
this.formData = {
id: null,
relId: null,
ggxh: null,
deptCode: null,
invCode: null,
invSpaceCode: null,
lowStock: false,
lackStock: false,
overStock: false,
expireDate: false,
recentDate: false,
remark: null
};
this.getList();
},
//
handleForm(index, row) {
this.formData = row;
this.formName = "edit";
this.formVisible = true;
},
},
components: {
invRemindSetModify
},
created() {
this.getInvList();

@ -0,0 +1,287 @@
<template>
<div>
<el-form :model="setData" label-width="200px" style="margin-bottom: -15px">
<el-row>
<el-col :span="10">
<el-form-item label="仓库:">
<el-select v-model="setData.invCode" placeholder="请选择所属仓库"
@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="10">
<el-form-item class="query-form-item" label="货位:">
<el-select v-model="setData.invSpaceCode" placeholder="请选择货位"
@change="invSpaceChange"
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-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="产品名称:">
<el-autocomplete
class="inline-input"
style="width: 90%"
v-model="productName"
:fetch-suggestions="queryProductName"
placeholder="请输入内容"
@select="handleSelectProduct"
@clear="clearQueryProduct"
></el-autocomplete>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="规格型号:">
<el-select v-model="setData.ggxh" placeholder="请选择" style="width: 90%">
<el-option
v-for="item in ggxhList"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item class="query-form-item" label="是否开启低库存预警">
<el-radio v-model="setData.lowStock" :label="true" border>开启</el-radio>
<el-radio v-model="setData.lowStock" :label="false" border>关闭</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item class="query-form-item" label="是否开启负库存预警">
<el-radio v-model="setData.lackStock" :label="true" border>开启</el-radio>
<el-radio v-model="setData.lackStock" :label="false" border>关闭</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item class="query-form-item" label="是否开启库存积压预警">
<el-radio v-model="setData.overStock" :label="true" border>开启</el-radio>
<el-radio v-model="setData.overStock" :label="false" border>关闭</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item class="query-form-item" label="是否开启产品过期预警">
<el-radio v-model="setData.expireDate" :label="true" border>开启</el-radio>
<el-radio v-model="setData.expireDate" :label="false" border>关闭</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item class="query-form-item" label="是否开启近效期预警">
<el-radio v-model="setData.recentDate" :label="true" border>开启</el-radio>
<el-radio v-model="setData.recentDate" :label="false" border>关闭</el-radio>
</el-form-item>
</el-col>
</el-row>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="closeDialog">取消</el-button>
<el-button type="primary" @click.native="formSubmit()" :loading="formLoading"
>提交
</el-button>
</div>
</div>
</template>
<script>
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import {filterProductNames} from "@/api/inventory/invPorduct";
import {getGgxhList} from "@/api/basic/product/udiRelevance";
import {isBlank} from "@/utils/strUtil";
import {saveInvRemindSet} from "@/api/system/invRemindSet";
export default {
props: {
invRemindSetData: {
type: Object,
required: true
},
closeDialog: {
type: Function,
required: true
},
formName: {
type: String,
required: true
}
},
name: "invRemindSetModify",
data() {
return {
setData: {
id: null,
relId: null,
ggxh: null,
deptCode: this.$store.getters.locDeptCode,
invCode: this.$store.getters.locInvCode,
invSpaceCode: null,
lowStock: false,
lackStock: false,
overStock: false,
expireDate: false,
recentDate: false,
remark: null
},
invList: [],
spaceList: [],
productName: null,
ggxhList: [],
formLoading: false
};
},
methods: {
invChange() {
this.spaceList = [];
this.setData.invSpaceCode = null;
this.getSpaceList();
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
this.getSpaceList();
})
.catch(() => {
});
},
getSpaceList() {
let params = {invWarehouseCode: this.setData.invCode, status: 1};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
})
},
invSpaceChange() {
let params = {
cpmctymc: null,
invCode: this.setData.invCode,
invSpaceCode: this.setData.invSpaceCode
};
filterProductNames(params).then((res) => {
this.productList = res.data.list || [];
})
},
queryProductName(productName, cb) {
let params = {
cpmctymc: productName,
invCode: this.setData.invCode,
invSpaceCode: this.setData.invSpaceCode
};
filterProductNames(params).then((res) => {
let productList = res.data.list || [];
let results = productName ? productList.filter(this.createFilter(productName)) : productList;
let rs = [];
results.forEach(item => {
let data = {value: item.cpmctymc, relId: item.relIdFk}
rs.push(data);
});
cb(rs);
})
},
createFilter(queryString) {
return (productList) => {
return productList.cpmctymc.toLowerCase().indexOf(queryString.toLowerCase()) === 0;
}
},
handleSelectProduct(item) {
this.queryName = item.value;
this.setData.relId = item.relId;
this.setData.ggxh = null;
let params = {relId: item.relId};
getGgxhList(params).then((res) => {
this.ggxhList = res.data || [];
});
},
clearQueryProduct() {
this.queryName = null;
this.setData.relId = null;
},
formSubmit() {
let result = this.verifyFormData();
if (result !== "success") {
this.$message.warning(result);
return;
}
this.formLoading = true;
saveInvRemindSet(this.setData, this.formName)
.then((response) => {
this.formLoading = false;
if (response.code !== 20000) {
this.$message.error(response.message);
return false;
}
this.$message.success("操作成功");
this.closeDialog();
})
.catch((error) => {
this.$message.error(error.message);
this.formLoading = false;
});
},
verifyFormData() {
if (isBlank(this.setData.invCode)) {
return "请选择预警仓库";
}
if (!isBlank(this.setData.relId)) {
if (isBlank(this.setData.ggxh)) {
return "请选择规格型号";
}
}
if (this.setData.lowStock === false && this.setData.lackStock === false && this.setData.overStock === false && this.setData.expireDate === false && this.setData.recentDate === false) {
return "至少开启一项预警";
}
},
},
created() {
if (!isBlank(this.invRemindSetData.id)) {
this.setData = this.invRemindSetData;
}
this.getInvList();
},
};
</script>
<style type="text/scss" lang="scss">
.el-radio {
width: 10%;
}
</style>
Loading…
Cancel
Save