Skip to content

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

bug完善

parent 4a18acc2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 45 deletions
src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue
View file @ caed2e8c
......@@ -49,6 +49,7 @@
const columns = [
{
title: '发放单位',
width:'200px',
dataIndex: 'sendNodeName',
ellipsis: true
},
......@@ -64,7 +65,6 @@
},
{
title: '批次号',
width: '120px',
dataIndex: 'batchNumber',
ellipsis: true
},
......@@ -75,7 +75,6 @@
},
{
title: '有效期',
width: '120px',
scopedSlots: {customRender: 'expireDateS'},
},
{
......@@ -106,7 +105,6 @@
{
title: '操作',
align: 'center',
width: 120,
fixed: 'right',
scopedSlots: {customRender: 'action'},
},
......
src/views/indexComponent/folviteApply/folviteApply.vue
View file @ caed2e8c
......@@ -17,9 +17,9 @@
<!--v-price="{digit:4}"-->
<a-input v-model="searchForm.telephone" placeholder="请输入联系电话" style="width: 250px"></a-input>
</a-form-item>
<a-button type="primary" icon="search" class="search_btn" @click="searchList">搜索</a-button>
<a-button class="search_btn" icon="close" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
<div style="clear: both"></div>
<a-button type="primary" icon="search" class="search_btn" @click="searchList">搜索</a-button>
<a-button class="search_btn" icon="close" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
<div style="clear: both"></div>
</a-form>
<div style="clear: both"></div>
......@@ -34,7 +34,8 @@
</template>
<template slot="action" slot-scope="record">
<a-button type="link" size="small" @click="toDetail(record)" :disabled="record.status===2">发放</a-button>
<a-button type="link" size="small" @click="deleteConfirm(record)" :disabled="record.status===2">删除</a-button>
<a-button type="link" size="small" @click="deleteConfirm(record)" :disabled="record.status===2">删除
</a-button>
</template>
</a-table>
<a-pagination
......@@ -54,6 +55,7 @@
<script>
import {getEnumByFlag, isEmptyParams} from "../../utils/common";
import moment from 'moment'
const columns = [
{
title: '女方姓名',
......@@ -104,8 +106,8 @@
{
title: '操作',
align: 'center',
fixed:'right',
width:120,
fixed: 'right',
width: 120,
scopedSlots: {customRender: 'action'},
},
]
......@@ -127,7 +129,7 @@
columns,
tableData: [],
loading: false,
routerParams:{}
routerParams: {}
}
},
created() {
......@@ -186,10 +188,10 @@
},
restSearchForm() {
this.searchForm = {
breedId: undefined,
medicalName: '',
factoryId: '',
produceDate: undefined
breedId: undefined,
medicalName: '',
factoryId: '',
produceDate: undefined
}
this.searchList()
},
......@@ -219,10 +221,10 @@
},
toDetail(record) {
let params = {
...record,
id: record.id,
routerFlag: 'update'
}
this.$router.push({path:'/folviteDistribution/add', query: params})
this.$router.push({path: '/folviteDistribution/add', query: params})
}
},
}
......@@ -242,10 +244,11 @@
.btn_space {
margin-right: 5px;
}
/* .search_form {
margin-top: -17px;
border: 1px solid rgba(255,77,128, .2);
border-top: 0px;
padding: 30px;
}*/
/* .search_form {
margin-top: -17px;
border: 1px solid rgba(255,77,128, .2);
border-top: 0px;
padding: 30px;
}*/
</style>
src/views/indexComponent/folviteDistribution/components/inStockManageInfo.vue
View file @ caed2e8c
......@@ -196,7 +196,6 @@
pageIndex: this.pagination.pageIndex,
pageSize: this.pagination.pageSize
}
console.log(par);
this.$api.stockManage.fetchInStockList(par).then(({data = {}}) => {
const {dataList = [], total = 0} = data
this.tableData = dataList
......
src/views/indexComponent/folviteDistribution/folviteDistribution.vue
View file @ caed2e8c
......@@ -48,6 +48,7 @@
:multiple="true"
:action="uploadAction"
:headers="headers"
@preview="preview"
@change="handleChange"
:file-list="fileList"
>
......@@ -100,7 +101,7 @@
{
title: '证件号码',
dataIndex: 'womenIdCard',
ellipsis: true
ellipsis: false
},
{
title: '联系电话',
......@@ -129,7 +130,8 @@
},
{
title: '操作',
align: 'center',
fixed:'right',
align: 'left',
width: "200px",
scopedSlots: {customRender: 'action'},
},
......@@ -234,6 +236,9 @@
});
this.fileList = fileList;
},
preview(val){
window.open(val.response.data.trueDownloadUrl)
},
onsubmit() {
if (this.$api.utils.isBlank(this.formData.consentId)) {
this.$message.warning('请上传文件');
......
src/views/indexComponent/inStockManage/inStockManage.vue
View file @ caed2e8c
......@@ -112,13 +112,13 @@
const columns = [
{
title: '品牌',
dataIndex: 'brandName',
title: '供应商名称',
dataIndex: 'supplierName',
ellipsis: true
},
{
title: '供应商名称',
dataIndex: 'supplierName',
title: '品牌',
dataIndex: 'brandName',
ellipsis: true
},
{
......@@ -142,11 +142,11 @@
dataIndex: 'unitPrice',
ellipsis: true
},
{
title: '规格',
dataIndex: 'specs',
ellipsis: true
},
// {
// title: '规格',
// dataIndex: 'specs',
// ellipsis: true
// },
{
title: '库存总数',
dataIndex: 'number',
......@@ -159,6 +159,7 @@
},
{
title: '操作',
fixed:"right",
align: 'center',
scopedSlots: {customRender: 'action'},
},
......@@ -239,7 +240,6 @@
getInStockList() {
this.loading = true;
let pars = this.getQueryParam();
console.log(pars);
this.$api.stockManage.fetchInStockList(pars).then(({data = {}}) => {
const {dataList = [], total = 0} = data
this.tableData = dataList
......@@ -304,7 +304,7 @@
this.$router.push({path: '/inStock/addMaterialDistribution', query: {selected: this.selectedRowKeys}})
},
toDetail(record) {
this.$router.push({path: '/inStock/inStockManageDetail', query: record})
this.$router.push({path: '/inStock/inStockManageDetail', query: {id:record.id}})
}
},
}
......
src/views/indexComponent/supplyManage/components/addSupply.vue
View file @ caed2e8c
......@@ -105,12 +105,12 @@
{required: true, message: '请输入联系人电话', trigger: 'change'},
{validator: checkPhone},
],
areaCode: [
{required: true, message: '请选择联系地址', trigger: 'change'}
],
address: [
{required: true, message: '请输入详细地址', trigger: 'change'}
],
// areaCode: [
// {required: true, message: '请选择联系地址', trigger: 'change'}
// ],
// address: [
// {required: true, message: '请输入详细地址', trigger: 'change'}
// ],
},
queryParams: {},
areaInfo: [],
......@@ -158,7 +158,6 @@
targetOption.children = [...data]
this.areaInfo = [...this.areaInfo]
}
console.log(this.areaInfo)
})
},
// 弹窗确定按钮
......@@ -173,7 +172,6 @@
areaCode: areaInfo,
...others
};
console.log(par)
if (this.queryParams.modeType === 'add') {
vm.$api.common.fetchAddSupply(par).then(res => {
this.subLoad = false;
......
src/views/indexComponent/supplyManage/supplyManage.vue
View file @ caed2e8c
......@@ -119,7 +119,7 @@
}
},
created() {
this.routerParams = this.$route.query
this.routerParams = this.$route.query;
if (this.routerParams.menuId) {
window.sessionStorage.setItem('menuId', this.routerParams.menuId)
}
......
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