Skip to content

F
folacin-front
Commit 933ae6ea authored by 罗成兵's avatar 罗成兵
Browse files
Options

分配入库完善

parent 69667d0c
master dev gcl yueyang
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing with 180 additions and 103 deletions
src/api/index.js
View file @ 933ae6ea
......@@ -10,12 +10,16 @@ export default {
'json',
)
},
fetchAllChildOrgInfo() {//查询当前单位的所有下级单位
return fetch(`/v1/folacin-admin/folacin-provide-record/child-unit`)
},
fetchMedicalType(params) {//获取分类
return fetch('/basic-info/v1/basic-info/basic-medical-breed/all', params)
},
fetchAllMedicalName(params) {//获取所有品种名称(单位端)
return fetch('/basic-info/v1/basic-info/basic-medical-info/all', params)
},
fetchUnitInfo(params) {//获取单位（父级）
return fetch(`/basic-info/v1/basic-info/basic-org-info/all-child/${params.id}`, params)
},
......@@ -81,6 +85,14 @@ export default {
fetchReceiveRecordList(params) {//入库管理列表
return fetch('/v1/folacin-admin/folacin-send-record/receive-record', params);
},
/*查询入库单详情*/
fetchReceiveDetails(id) {
return fetch(`/v1/folacin-admin/folacin-send-record/receive-details/${id}`);
},
/*确认入库*/
fetchReceiveConfirm(params) {
return fetch(`/v1/folacin-admin/folacin-send-record/receive/`,params);
},
/*分配出库列表*/
fetchSendRecordList(params) {//入库管理列表
return fetch('/v1/folacin-admin/folacin-send-record/send-record', params);
......
src/views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue
View file @ 933ae6ea
......@@ -8,63 +8,63 @@
<div style="margin-top: 16px">
<a-descriptions bordered :column="{ sm: 2, xs: 1 }">
<a-descriptions-item label="发货单位">
{{detailInfo.medicalName || '--'}}
{{detailInfo.sendUnitName || '--'}}
</a-descriptions-item>
<a-descriptions-item label="分配日期">
{{detailInfo.breedName || '--'}}
{{detailInfo.sendDate || '--'}}
</a-descriptions-item>
<a-descriptions-item label="发货人姓名">
{{detailInfo.batchNumber || '--'}}
{{detailInfo.sendContact || '--'}}
</a-descriptions-item>
<a-descriptions-item label="联系电话">
{{detailInfo.expireDate || '--'}}
{{detailInfo.sendPhone || '--'}}
</a-descriptions-item>
<a-descriptions-item label="供应商">
{{detailInfo.expireDate || '--'}}
{{detailInfo.supplierName || '--'}}
</a-descriptions-item>
<a-descriptions-item label="品牌">
{{detailInfo.unit || '--'}}
{{detailInfo.brandName || '--'}}
</a-descriptions-item>
<a-descriptions-item label="批次号">
{{detailInfo.specs || '--'}}
{{detailInfo.batchNumber || '--'}}
</a-descriptions-item>
<a-descriptions-item label="生产日期">
{{detailInfo.specs || '--'}}
{{detailInfo.produceDate || '--'}}
</a-descriptions-item>
<a-descriptions-item label="有效期至">
{{detailInfo.specs || '--'}}
{{detailInfo.expireDate || '--'}}
</a-descriptions-item>
<a-descriptions-item label="单价">
{{detailInfo.unit || '--'}}<span>元</span>
{{detailInfo.unitPrice || '--'}}<span>元</span>
</a-descriptions-item>
<a-descriptions-item label="数量">
{{detailInfo.stockNum || '--'}}
{{detailInfo.sendNum || '--'}}
</a-descriptions-item>
<a-descriptions-item label="入库状态">
{{detailInfo.stockNum || '--'}}
{{detailInfo.statusName || '--'}}
</a-descriptions-item>
</a-descriptions>
<a-form-model ref="formRef" :model="formData" :rules="formRules"
<a-form-model ref="formRef" :model="formData"
:labelCol="{span: 4}"
:wrapperCol="{span: 16}"
style="margin-top: 20px"
>
<a-form-model-item label="备注"
prop="stockNum"
prop="remarks"
:labelCol="{span: 6}"
:wrapperCol="{span: 15}">
<a-textarea
:rows="6"
v-model="formData.stockNum"
v-model="formData.remarks"
placeholder="请输入备注"></a-textarea>
</a-form-model-item>
</a-form-model>
</div>
</div>
<div style="text-align: center;margin-top: 40px">
<a-button @click="goBack">取消</a-button>
<a-button type="primary" @click="goBack" style="margin-left: 10px">入库</a-button>
<a-button @click="goBack(1)">取消</a-button>
<a-button type="primary" @click="goBack(2)" style="margin-left: 10px">入库</a-button>
</div>
</a-card>
</div>
......@@ -78,30 +78,45 @@
return {
routerParams: {},
detailInfo: {},
formData: {
},
formRules: [
]
formData: {},
formRules: []
}
},
created() {
this.routerParams = this.$route.query
this.getStockListDetail()
this.routerParams = this.$route.query;
this.getReceiveDetails()
},
methods: {
getStockListDetail() {
let par = {
id: this.routerParams.id
}
this.$api.stockManage.fetchInStockLisDetail(par).then(({data = [], code}) => {
this.detailInfo = data
getReceiveDetails() {
this.$api.stockManage.fetchReceiveDetails(this.routerParams.id).then(({data = [], code}) => {
this.detailInfo = data;
})
},
goBack() {
goBack(type) {
if (type == 1) {
closedDetail('/inStock/inStockManageDetail', '/Home/distributionWarehousing');
return;
}
let that = this;
let params = {
recordId: this.detailInfo.id, remarks: this.formData.remarks
};
this.$confirm({
title: '确认入库吗?',
content: "",
onOk() {
that.$api.stockManage.fetchReceiveConfirm(params).then(({data = [], code}) => {
if (code === 'SUCCESS') {
closedDetail('/inStock/inStockManageDetail', '/Home/distributionWarehousing')
}
});
},
onCancel() {
that.$message.warning('已取消!');
},
class: 'test',
});
}
},
}
</script>
......
src/views/indexComponent/distributionWarehousing/components/distributionWarehousingDetail.vue
View file @ 933ae6ea
......@@ -8,46 +8,59 @@
<div style="margin-top: 16px">
<a-descriptions bordered :column="{ sm: 2, xs: 1 }">
<a-descriptions-item label="发货单位">
{{detailInfo.medicalName || '--'}}
{{detailInfo.sendUnitName || '--'}}
</a-descriptions-item>
<a-descriptions-item label="分配日期">
{{detailInfo.breedName || '--'}}
{{detailInfo.sendDate || '--'}}
</a-descriptions-item>
<a-descriptions-item label="发货人姓名">
{{detailInfo.batchNumber || '--'}}
{{detailInfo.sendContact || '--'}}
</a-descriptions-item>
<a-descriptions-item label="联系电话">
{{detailInfo.expireDate || '--'}}
{{detailInfo.sendPhone || '--'}}
</a-descriptions-item>
<a-descriptions-item label="供应商">
{{detailInfo.expireDate || '--'}}
{{detailInfo.supplierName || '--'}}
</a-descriptions-item>
<a-descriptions-item label="品牌">
{{detailInfo.unit || '--'}}
{{detailInfo.brandName || '--'}}
</a-descriptions-item>
<a-descriptions-item label="批次号">
{{detailInfo.specs || '--'}}
{{detailInfo.batchNumber || '--'}}
</a-descriptions-item>
<a-descriptions-item label="生产日期">
{{detailInfo.specs || '--'}}
{{detailInfo.produceDate || '--'}}
</a-descriptions-item>
<a-descriptions-item label="有效期至">
{{detailInfo.specs || '--'}}
{{detailInfo.expireDate || '--'}}
</a-descriptions-item>
<a-descriptions-item label="单价">
{{detailInfo.unit || '--'}}<span>元</span>
{{detailInfo.unitPrice || '--'}}<span>元</span>
</a-descriptions-item>
<a-descriptions-item label="数量">
{{detailInfo.stockNum || '--'}}
{{detailInfo.sendNum || '--'}}
</a-descriptions-item>
<a-descriptions-item label="入库状态">
{{detailInfo.stockNum || '--'}}
</a-descriptions-item>
<a-descriptions-item label="备注">
{{detailInfo.stockNum || '--'}}
{{detailInfo.statusName || '--'}}
</a-descriptions-item>
</a-descriptions>
<a-form-model ref="formRef"
:labelCol="{span: 4}"
:wrapperCol="{span: 16}"
style="margin-top: 20px"
>
<a-form-model-item label="备注"
prop="remarks"
:labelCol="{span: 6}"
:wrapperCol="{span: 15}">
<a-textarea
:disabled="true"
:rows="6"
v-model="detailInfo.remarks"
placeholder="请输入备注"></a-textarea>
</a-form-model-item>
</a-form-model>
</div>
</div>
<div style="text-align: center;margin-top: 40px">
......@@ -69,14 +82,11 @@
},
created() {
this.routerParams = this.$route.query
this.getStockListDetail()
this.getReceiveDetails()
},
methods: {
getStockListDetail() {
let par = {
id: this.routerParams.id
}
this.$api.stockManage.fetchInStockLisDetail(par).then(({data = [], code}) => {
getReceiveDetails() {
this.$api.stockManage.fetchReceiveDetails(this.routerParams.id).then(({data = [], code}) => {
this.detailInfo = data
})
},
......
src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue
View file @ 933ae6ea
......@@ -35,7 +35,7 @@
</template>
<template slot="action" slot-scope="record">
<a-button type="link" size="small" @click="toDetail(record)">查看</a-button>
<a-button type="link" size="small" @click="toAdd(record)">入库</a-button>
<a-button v-if="record.statusName=='未接收'" type="link" size="small" @click="toAdd(record)">入库</a-button>
</template>
</a-table>
<myPagination v-model="pagination" :pagination="pagination" @getList="getReceiveRecord"></myPagination>
......@@ -46,6 +46,7 @@
import moment from 'moment'
import myPagination from "../../components/myPagination";
import dateRangePicker from "../../components/dateRangePicker";
const columns = [
{
title: '发放单位',
......@@ -98,6 +99,11 @@
dataIndex: 'statusName',
ellipsis: true
},
{
title: '入库日期',
dataIndex: 'receiveDate',
ellipsis: true
},
{
title: '操作',
align: 'center',
......@@ -112,10 +118,8 @@
return {
// 搜索框对象
searchForm: {
breedId: undefined,
medicalName: '',
factoryId: '',
produceDate: undefined
status: '',
date: []
},
statusList: [],
pagination: {
......@@ -127,7 +131,7 @@
columns,
tableData: [],
loading: false,
allSupplyInfo:[],
allSupplyInfo: [],
}
},
created() {
......@@ -145,6 +149,8 @@
let pars = isEmptyParams(this.searchForm)
let par = {
...pars,
startDate: this.searchForm.date[0],
endDate: this.searchForm.date[1],
pageIndex: this.pagination.pageIndex,
pageSize: this.pagination.pageSize
}
......@@ -159,21 +165,19 @@
},
restSearchForm() {
this.searchForm = {
breedId: undefined,
medicalName: '',
factoryId: '',
produceDate: undefined
status: '',
date: []
}
this.searchList()
},
downloadExcel(){
downloadExcel() {
},
toDetail(record) {
this.$router.push({path:'/distributionWarehousing/detail', query: record})
this.$router.push({path: '/distributionWarehousing/detail', query: record})
},
toAdd(record) {
this.$router.push({path:'/distributionWarehousing/add', query: record})
this.$router.push({path: '/distributionWarehousing/add', query: {id: record.id}})
}
},
}
......@@ -193,6 +197,7 @@
.btn_space {
margin-right: 5px;
}
/*.search_form {
margin-top: -17px;
border: 1px solid rgba(255,77,128, .2);
......
src/views/indexComponent/distributionWarehousing/sendRecord.vue
View file @ 933ae6ea
......@@ -27,9 +27,10 @@
rowKey="id"
:loading="loading"
:pagination="false"
bordered
>
<template slot="statusName" slot-scope="record">
<a-button type="link" size="small" @click="toDetail(record.statusName)">{{record.statusName}}</a-button>
<a-button type="link" size="small">{{record.statusName}}</a-button>
</template>
<a-table
slot="expandedRowRender"
......@@ -38,9 +39,10 @@
:data-source="record.detailedList"
:pagination="false"
>
<template slot="statusName" slot-scope="record">
<a-button type="link" size="small">{{record.statusName}}</a-button>
</template>
</a-table>
</a-table>
<myPagination v-model="pagination" :pagination="pagination" @getList="getSendRecord"></myPagination>
</div>
......@@ -54,83 +56,110 @@
const columns = [
{
title: '收货单位',
dataIndex: 'sendUnitName',
dataIndex: 'receiveUnitName',
width:"240px",
ellipsis: true
},
{
title: '发货人',
width:"160px",
dataIndex: 'sendContact',
ellipsis: true
},
{
title: '发货人电话',
width:"240px",
dataIndex: 'sendPhone',
ellipsis: true
},
{
title: '发货日期',
width:"160px",
dataIndex: 'sendDate',
ellipsis: true
},
{
title: '收货人',
width:"160px",
dataIndex: 'receiver',
ellipsis: true
},
{
title: '收货人电话',
dataIndex: 'receivePhone',
width:"160px",
ellipsis: true
},
{
title: '收货时间',
dataIndex: 'receiveDate',
ellipsis: true
},
// {
// title: '收货时间',
// dataIndex: 'receiveDate',
// ellipsis: true
// },
{
title: '收货状态',
scopedSlots: {customRender: 'statusName'},
ellipsis: true
},
{
title: '备注',
dataIndex: 'remarks',
ellipsis: true
},
// {
// title: '备注',
// dataIndex: 'remarks',
// ellipsis: true
// },
];
const innerColumns = [
{
title: '供应商名称',
dataIndex: 'supplierName',
width:"240px",
ellipsis: true
},
{
title: '品牌',
width:"160px",
dataIndex: 'brandName',
ellipsis: true
},
{
title: '批次号',
width: '120px',
width:"240px",
dataIndex: 'batchNumber',
ellipsis: true
},
{
title: '生产日期',
width:"160px",
dataIndex: 'produceDate',
ellipsis: true
},
{
title: '有效期',
width: '120px',
title: '有效期至',
width:"160px",
dataIndex: 'expireDate',
},
{
title: '分配数量',
width:"160px",
dataIndex: 'sendNum',
ellipsis: true
},
{
title: '收货状态',
width:"160px",
scopedSlots: {customRender: 'statusName'},
ellipsis: true
},
{
title: '收货日期',
width:"160px",
dataIndex: 'receiveDate',
ellipsis: true
},
{
title: '备注',
dataIndex: 'remarks',
ellipsis: true
},
];
export default {
name: "sendRecord",
......
src/views/indexComponent/inStockManage/components/addMaterialDistribution.vue
View file @ 933ae6ea
......@@ -5,7 +5,8 @@
<div style="font-size: 18px;font-weight: 600">
<span>调拨分配</span>
</div>
<a-form-model ref="formRef" :model="formData" :rules="formRules" :labelCol="{span: 7}" :wrapperCol="{span: 15}">
<a-form-model ref="formRef" :model="formData" :rules="formRules" :labelCol="{span: 7}"
:wrapperCol="{span: 15}">
<div>
<a-divider orientation="left">
......@@ -32,7 +33,8 @@
</a-col>
<a-col :span="8">
<a-form-model-item label="收货单位" prop="receiveUnitId">
<a-select v-model="formData.receiveUnitId" placeholder="请选择" @click.native="getChildUnitList">
<a-select v-model="formData.receiveUnitId" placeholder="请选择"
@click.native="getChildUnitList">
<a-select-option v-for="item in childUnitList"
:key="item.id" :value="item.id"
>
......@@ -58,14 +60,16 @@
分配详情
</a-divider>
</div>
<a-table :dataSource="formData.detailedList" rowKey="id" :pagination="false" class="modal_table" bordered>
<a-table-column title="品牌" data-index="brandName" ></a-table-column>
<a-table-column title="供应商名称" data-index="supplierName" ></a-table-column>
<a-table-column title="批次号" data-index="batchNumber" ></a-table-column>
<a-table-column title="当前库存" data-index="number" ></a-table-column>
<a-table :dataSource="formData.detailedList" rowKey="id" :pagination="false" class="modal_table"
bordered>
<a-table-column title="品牌" data-index="brandName"></a-table-column>
<a-table-column title="供应商名称" data-index="supplierName"></a-table-column>
<a-table-column title="批次号" data-index="batchNumber"></a-table-column>
<a-table-column title="当前库存" data-index="number"></a-table-column>
<a-table-column title="分配数量" width="190px" fixed="right">
<template slot-scope="text, record, index">
<a-form-model-item :prop="'detailedList.' + index + '.sendNum'" :rules="formRules.sendNum" class="tab_input_r">
<a-form-model-item :prop="'detailedList.' + index + '.sendNum'"
:rules="formRules.sendNum" class="tab_input_r">
<a-input type="number"
v-toInt
v-model="record.sendNum"
......@@ -95,7 +99,8 @@
</a-form-model>
<div style="text-align: center;margin-top: 16px">
<a-button @click="goBack">取消</a-button>
<a-button type="primary" @click="addMaterialDis" :loading="subLoad" style="margin-left: 8px">调拨分配</a-button>
<a-button type="primary" @click="addMaterialDis" :loading="subLoad" style="margin-left: 8px">调拨分配
</a-button>
</div>
</a-card>
</a-spin>
......@@ -106,6 +111,7 @@
<script>
import {checkPhone, closedDetail} from "../../../utils/common";
import moment from 'moment'
let vm = this
let recordInfo = {}
export default {
......@@ -172,8 +178,9 @@
},
created() {
this.getSelectedMedical()
this.formData.sendUnitId = this.unitInfo.unitId
this.formData.sendUnitName = this.unitInfo.unitName
this.formData.sendUnitId = this.unitInfo.unitId;
this.formData.sendUnitName = this.unitInfo.unitName;
this.getChildUnitList();
},
methods: {
// 删除药具
......@@ -195,13 +202,12 @@
},
// 获取当前单位的下级单位
getChildUnitList() {
let params = {}
this.childUnitList = [{id:16625, unitName:'gcl'}]
// this.$api.common.fetchMaterialDisUnitInfo(params).then(({code, data}) => {
// if (code === 'SUCCESS') {
// this.childUnitList = data;
// }
// });
//this.childUnitList = [{id:16625, unitName:'gcl'}]
this.$api.common.fetchAllChildOrgInfo().then(({code, data}) => {
if (code === 'SUCCESS') {
this.childUnitList = data;
}
});
},
addMaterialDis() {//调拨分配
this.$refs.formRef.validate(valid => {
......@@ -239,7 +245,7 @@
});
},
goBack() {
closedDetail('/inStock/addMaterialDistribution','/Home/inStock')
closedDetail('/inStock/addMaterialDistribution', '/Home/inStock')
}
}
}
......@@ -248,7 +254,7 @@
<style lang="less">
.addMaterialDistribution {
.ant-table-thead > tr > th, .ant-table-tbody > tr > td {
padding: 10px!important;
padding: 10px !important;
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment