Skip to content

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

分配记录

parent 4a5f07d6
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 36 deletions
src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue
View file @ 2556a289
......@@ -28,6 +28,7 @@
rowKey="id"
:loading="loading"
:pagination="false"
:scroll="{ x: 1}"
>
<template slot="expireDateS" slot-scope="record">
{{record.expireDate | formatDate}}
......@@ -56,7 +57,7 @@
{
title: '发放单位',
width:'200px',
dataIndex: 'sendNodeName',
dataIndex: 'sendUnitName',
ellipsis: true
},
// {
......@@ -67,52 +68,62 @@
{
title: '品牌',
dataIndex: 'brandName',
ellipsis: true
ellipsis: true,
width:'200px'
},
{
title: '批次号',
dataIndex: 'batchNumber',
ellipsis: true
ellipsis: true,
width:'200px'
},
{
title: '生产日期',
dataIndex: 'produceDate',
ellipsis: true
ellipsis: true,
width:'200px'
},
{
title: '有效期',
width:'200px',
scopedSlots: {customRender: 'expireDateS'},
},
{
title: '单价(元)',
dataIndex: 'unitPrice',
ellipsis: true
ellipsis: true,
width:'200px'
},
{
title: '规格',
dataIndex: 'specs',
ellipsis: true
ellipsis: true,
width:'200px'
},
{
title: '分配数量',
dataIndex: 'sendNum',
ellipsis: true
ellipsis: true,
width:'200px'
},
{
title: '入库状态',
// dataIndex: 'statusName',
// ellipsis: true,
width:'200px',
scopedSlots: {customRender: 'statusNameInfo'},
},
{
title: '入库日期',
dataIndex: 'receiveDate',
ellipsis: true
ellipsis: true,
width:'200px'
},
{
title: '操作',
align: 'center',
fixed: 'right',
width:'200px',
scopedSlots: {customRender: 'action'},
},
]
......@@ -217,7 +228,6 @@
.btn_space {
margin-right: 5px;
}
/*.search_form {
margin-top: -17px;
border: 1px solid rgba(255,77,128, .2);
......
src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue
View file @ 2556a289
......@@ -475,7 +475,7 @@
this.$api.common.fetchAreaByCode({areaCode: targetOption.areaCode}).then(({data = []}) => {
targetOption.loading = false;
data.forEach(item => {
item['isLeaf'] = false
item['isLeaf'] = item.areaLevel >= 5;
})
if (targetOption.areaCode == 0) {
this.areaInfo = [...data]
......
src/views/indexComponent/inStockManage/components/addMaterialDistribution.vue
View file @ 2556a289
......@@ -3,15 +3,15 @@
<a-spin tip="加载中..." :spinning="spinning">
<div style="padding: 16px">
<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}">
<span>调拨分配</span>
</div>
<a-form-model ref="formRef" :model="formData" :rules="formRules" :labelCol="{span: 7}"
:wrapperCol="{span: 15}">
<div style="margin: 30px 0px">
<div class="divider_my"><span class="midText">分配信息</span></div>
</div>
<div style="clear: both"></div>
<div style="margin: 30px 0px">
<div class="divider_my"><span class="midText">分配信息</span></div>
</div>
<div style="clear: both"></div>
<div>
<a-row>
<a-col :span="8">
......@@ -54,10 +54,10 @@
</a-col>
</a-row>
</div>
<div>
<div class="divider_my"><span class="midText">分配详情</span></div>
</div>
<div style="clear: both"></div>
<div>
<div class="divider_my"><span class="midText">分配详情</span></div>
</div>
<div style="clear: both"></div>
<a-table :dataSource="formData.detailedList" rowKey="id" :pagination="false" class="modal_table"
bordered>
<a-table-column title="品牌" data-index="brandName"></a-table-column>
......@@ -217,12 +217,14 @@
let params = {}
let reviceUnitName = this.childUnitList.filter(item => item.id == this.formData.receiveUnitId)[0].unitName;
let treeNodeId = this.childUnitList.filter(item => item.id == this.formData.receiveUnitId)[0].treeNodeId;
let unitInfo = JSON.parse(window.sessionStorage.setItem('unitInfo'));
params = {
...this.formData,
receiveNodeId:treeNodeId,
receiveNodeName:reviceUnitName,
receiveNodeId: treeNodeId,
receiveNodeName: reviceUnitName,
sendDate: moment(this.formData.sendDate).format('yyyy-MM-DD'),
receiveUnitName: reviceUnitName
receiveUnitName: reviceUnitName,
sendUnitName: unitInfo.unitName
};
let detailedList = [];
this.formData.detailedList.forEach(item => {
......@@ -258,14 +260,16 @@
border: 1px solid #F0F0F0;
border-bottom: 0px
}
.addMaterialDistribution {
.ant-table-thead > tr > th, .ant-table-tbody > tr > td {
padding: 10px !important;
}
}
.modal_table {
.ant-form-item {
margin-bottom: 0px!important;
margin-bottom: 0px !important;
}
}
</style>
src/views/indexComponent/supplyManage/components/addSupply.vue
View file @ 2556a289
......@@ -149,7 +149,7 @@
this.$api.common.fetchAreaByCode({areaCode: targetOption.areaCode}).then(({data = []}) => {
targetOption.loading = false;
data.forEach(item => {
item['isLeaf'] = false
item['isLeaf'] = item.areaLevel >= 5;
})
if (targetOption.areaCode == 0) {
this.areaInfo = [...data]
......@@ -165,9 +165,9 @@
let vm = this;
this.$refs.formRef.validate(valid => {
if (true) {
// vm.subLoad = true;
// vm.subLoad = true;
const {areaCode, areaName, ...others} = vm.formData
let areaInfo = areaCode[areaCode.length -1]
let areaInfo = areaCode[areaCode.length - 1]
let par = {
areaCode: areaInfo,
...others
......
src/views/indexComponent/supplyManage/supplyManage.vue
View file @ 2556a289
......@@ -13,8 +13,12 @@
</a-select>
</a-form-item>
<a-form-item>
<a-button type="primary" icon="search" class="search_btn" style="margin-left: 10px" @click="searchList">搜索</a-button>
<a-button class="search_btn ant-table-btn" icon="sync" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
<a-button type="primary" icon="search" class="search_btn" style="margin-left: 10px" @click="searchList">
搜索
</a-button>
<a-button class="search_btn ant-table-btn" icon="sync" style="margin-left: 10px"
@click="restSearchForm">清空
</a-button>
</a-form-item>
<a-button type="primary" class="search_btn" style="float: right" @click="toAdd">添加供应商</a-button>
<div style="clear: both"></div>
......@@ -35,11 +39,11 @@
cancel-text="否"
@confirm="changeStatus(record)"
>
<a href="#">{{record.status === 1 ? '停用' : '启用'}}</a>
<a-button class="ant-table-btn" size="small">{{record.status==0?'启用':'停用'}}
</a-button>
<a-button style="margin-left: 10px" class="ant-table-btn" size="small" @click="updateSupply(record)">修改</a-button>
</a-popconfirm>
<a-button type="link" size="small" @click="updateSupply(record)">修改</a-button>
<!-- <a-button type="link" size="small" @click="deleteConfirm(record)">删除</a-button>-->
<!-- <a-button type="link" size="small" @click="deleteConfirm(record)">删除</a-button>-->
</template>
</a-table>
<a-pagination
......@@ -58,6 +62,7 @@
</template>
<script>
import {getEnumByFlag, isEmptyParams} from "../../utils/common";
const columns = [
{
title: '供应商名称',
......@@ -178,7 +183,7 @@
this.searchList()
},
toAdd() {
this.$router.push({path:'/supplyManage/add',query: {modeType: "add"}})
this.$router.push({path: '/supplyManage/add', query: {modeType: "add"}})
},
changeStatus(record) {
let par = {
......
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