This commit is contained in:
shilixia 2022-03-15 09:27:38 +08:00
parent 9c8cfd4731
commit 4e6312e3e0
2 changed files with 425 additions and 239 deletions

View File

@ -150,3 +150,11 @@ export function itemfiles(id, data) {
data
})
}
//其他出库
export function outOther(data) {
return request({
url: `/inm/fifo/out_other/`,
method: 'POST',
data
})
}

View File

@ -8,7 +8,7 @@
icon="el-icon-plus"
@click="handlecgCreate"
>
新增采购入库
采购入库
</el-button>
<el-button
v-if="checkPermission(['fifo_in_other'])"
@ -16,7 +16,15 @@
icon="el-icon-plus"
@click="handleCreate"
>
新增其他入库
其他入库
</el-button>
<el-button
v-if="checkPermission(['fifo_out_other'])"
type="primary"
icon="el-icon-plus"
@click="handleoutCreate"
>
其他出库
</el-button>
<el-input
v-model="listQuery.search"
@ -54,12 +62,11 @@
height="100"
v-el-height-adaptive-table="{ bottomOffset: 42 }"
>
<el-table-column type="index" width="50"/>
<el-table-column label="记录编号" prop="number">
</el-table-column>
<el-table-column type="index" width="50" />
<el-table-column label="记录编号" prop="number"> </el-table-column>
<el-table-column label="操作人员">
<template slot-scope="scope" v-if="scope.row.create_by">
{{scope.row.create_by_.name}}
{{ scope.row.create_by_.name }}
</template>
</el-table-column>
<el-table-column label="出/入库时间" prop="inout_date">
@ -73,12 +80,11 @@
<el-tag v-else>已审核</el-tag>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="create_time">
</el-table-column>
<el-table-column label="创建时间" prop="create_time"> </el-table-column>
<el-table-column align="center" label="操作" width="220px">
<template slot-scope="scope">
<el-link
v-if="checkPermission(['fifo_pack'])&&scope.row.type==2"
v-if="checkPermission(['fifo_pack']) && scope.row.type == 2"
type="primary"
@click="handlePack(scope)"
>
@ -92,7 +98,9 @@
查看
</el-link>
<el-link
v-if="checkPermission(['fifo_hear'])&&scope.row.is_audited == false"
v-if="
checkPermission(['fifo_hear']) && scope.row.is_audited == false
"
type="primary"
@click="handleAudit(scope)"
>
@ -141,16 +149,121 @@
</el-form-item>
</el-form>
<div style="text-align: right">
<el-button
type="danger"
@click="dialogVisibles = false"
>
<el-button type="danger" @click="dialogVisibles = false">
取消
</el-button>
<el-button
type="primary"
@click="confirminpur('Form1')"
<el-button type="primary" @click="confirminpur('Form1')">
确认
</el-button>
</div>
</el-dialog>
<el-dialog
:visible.sync="dialogVisibleout"
:close-on-click-modal="false"
title="新增出库记录"
>
<el-form
ref="Formout"
:model="outfifo"
label-width="80px"
label-position="right"
:rules="rule1"
>
<div v-for="(item, index) in outfifo.details" :key="index">
<el-row>
<el-col :span="10" style="margin-right: 10px">
<el-form-item
class="material_batch"
label="批次:"
:prop="'details.' + index + '.material_batch'"
>
<el-select
v-model="item.material_batch"
filterable
size="small"
>
<el-option
v-for="item in materialbatchoptions"
:key="item.id"
:value="item.id"
:label="item.batch"
>
<span style="float: left">{{ item.batch }}</span>
<span
style="float: right; color: #8492a6; font-size: 13px"
>{{ item.material_.name }}</span
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" style="margin-right: 50px">
<el-form-item
class="count"
label="出库数量"
:prop="'details.' + index + '.count'"
>
<el-input-number
v-model="item.count"
:min="0"
></el-input-number>
</el-form-item>
</el-col>
<!-- 删除按钮 -->
<el-col :span="1">
<el-tooltip
class="item"
effect="dark"
content="删除"
placement="top"
>
<el-button
@click="deleteItem1(index)"
style="
border: none;
background: none;
padding: 0px;
margin-top: 4px;
"
>
<i class="el-icon-remove-outline" style="font-size: 20px"></i>
</el-button>
</el-tooltip>
</el-col>
</el-row>
</div>
<div>
<el-tooltip
class="item"
effect="dark"
content="添加条件"
placement="top"
>
<el-button
@click="addConditions1"
style="
cursor: pointer;
width: 95%;
color: #fe000c;
border: 1px dashed #fe000c;
height: 40px;
padding: 0px;
margin-top: 2px;
margin-left: 20px;
font-size: 26px;
"
>
+
</el-button>
</el-tooltip>
</div>
</el-form>
<div style="text-align: right">
<el-button type="danger" @click="dialogVisibleout = false">
取消
</el-button>
<el-button type="primary" @click="confirmoutfifo('Formout')">
确认
</el-button>
</div>
@ -247,7 +360,7 @@
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width:100%"
style="width: 100%"
>
</el-date-picker>
</el-form-item>
@ -309,23 +422,25 @@
</div>
</template>
<script>
import {
import {
getfifoList,
createInventory,
createInother,
getWarehouseList,
deleteFifoitem,
getmaterialbatchList,
deleteFifo,
audit,
} from "@/api/inm";
import {getPuorderList} from "@/api/pum";
import checkPermission from "@/utils/permission";
import {getpVendorList} from "@/api/vendor";
import {getMaterialList} from "@/api/mtm";
import {getUserList} from "@/api/user";
import {genTree} from "@/utils";
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
const defaulteinventory = {
outOther,
} from "@/api/inm";
import { getPuorderList } from "@/api/pum";
import checkPermission from "@/utils/permission";
import { getpVendorList } from "@/api/vendor";
import { getMaterialList } from "@/api/mtm";
import { getUserList } from "@/api/user";
import { genTree } from "@/utils";
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
const defaulteinventory = {
vendor: null,
details: [
{
@ -335,12 +450,22 @@
batch: "", //批次
},
],
};
export default {
components: {Pagination},
};
const defaulteoutfifo = {
details: [
{
material_batch: null,
count: null,
},
],
};
export default {
components: { Pagination },
data() {
return {
inventory: defaulteinventory,
outfifo: defaulteoutfifo,
dialogVisibleout: false,
fifoList: {
count: 0,
},
@ -350,6 +475,7 @@
3: "采购入库",
4: "生产入库",
5: "其他入库",
6:"其他出库",
},
inpur: {},
listQuery: {
@ -357,6 +483,7 @@
page_size: 20,
},
puorderoptions: [],
materialbatchoptions: [],
warehouseData: [],
materialoptions: [],
vendoroptions: [],
@ -365,7 +492,7 @@
dialogType: "new",
dialogVisibles: false,
rule1: {
name: [{required: true, message: "请输入", trigger: "blur"}],
name: [{ required: true, message: "请输入", trigger: "blur" }],
},
};
},
@ -395,13 +522,13 @@
handleDetail(scope) {
this.$router.push({
name: "fifodetail",
params: {id: scope.row.id, pu_order: scope.row.pu_order},
params: { id: scope.row.id, pu_order: scope.row.pu_order },
});
},
//供应商列表
getListgys() {
getpVendorList({page: 0}).then((response) => {
getpVendorList({ page: 0 }).then((response) => {
if (response.data) {
this.vendoroptions = response.data;
}
@ -409,7 +536,7 @@
},
//采购订单
getpuorderList() {
getPuorderList({page: 0}).then((response) => {
getPuorderList({ page: 0 }).then((response) => {
if (response.data) {
this.puorderoptions = response.data;
}
@ -427,7 +554,7 @@
},
//仓库
getlists() {
getWarehouseList({page: 0}).then((response) => {
getWarehouseList({ page: 0 }).then((response) => {
if (response.data) {
this.warehouseData = genTree(response.data);
}
@ -437,7 +564,18 @@
handlecgCreate() {
this.dialogVisibles = true;
},
addConditions1() {
if (this.outfifo.details.length <= 10) {
this.outfifo.details.push({
material_batch: null,
count: null,
});
} else {
this.$message("最多可添加十项条件");
}
},
addConditions() {
if (this.inventory.details.length <= 10) {
this.inventory.details.push({
warehouse: "", //仓库
@ -452,16 +590,21 @@
deleteItem(index) {
this.inventory.details.splice(index, 1);
},
deleteItem1(index) {
this.outfifo.details.splice(index, 1);
},
//物料
getmaterialList() {
this.listLoading = true;
getMaterialList({pageoff: true}).then((response) => {
getMaterialList({ pageoff: true }).then((response) => {
if (response.data) {
this.materialoptions = genTree(response.data);
}
this.listLoading = false;
});
},
//其他入库
handleCreate() {
this.inventory.details = [
{
@ -478,6 +621,38 @@
this.$refs["Form"].clearValidate();
});
},
//其他出库
handleoutCreate() {
this.outfifo.details = [
{
material_batch: null,
count: null,
},
];
this.outfifo = Object.assign({}, defaulteoutfifo);
this.dialogVisibleout = true;
getmaterialbatchList({ page: 0 }).then((response) => {
if (response.data) {
this.materialbatchoptions = response.data;
}
});
this.$nextTick(() => {
this.$refs["Formout"].clearValidate();
});
},
confirmoutfifo() {
console.log(this.outfifo);
outOther(this.outfifo).then((res) => {
if (res.code >= 200) {
this.getList();
this.dialogVisibleout = false;
this.$message.success("成功");
}
});
},
//审核
handleAudit(scope) {
this.$confirm("是否通过?", "提示", {
@ -534,8 +709,11 @@
},
//装箱
handlePack(scope) {
this.$router.push({name: "salesdetail", params: {id: scope.row.sale},})
}
this.$router.push({
name: "salesdetail",
params: { id: scope.row.sale },
});
},
};
},
};
</script>