Skip to content

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

Merge remote-tracking branch 'origin/gcl' into gcl

parents 30ade053 7dd5e7a5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 229 additions and 130 deletions
src/router/index.js
View file @ 7540ffc3
...@@ -64,7 +64,7 @@ const router = new VueRouter({ ...@@ -64,7 +64,7 @@ const router = new VueRouter({
// 路由守卫 // 路由守卫
router.beforeEach((to, form, next) => { router.beforeEach((to, form, next) => {
NProgress.start(); // NProgress.start();
// if (to.path === '/Home/folviteIndex') { // if (to.path === '/Home/folviteIndex') {
return next(); return next();
// }; // };
...@@ -86,7 +86,7 @@ router.beforeEach((to, form, next) => { ...@@ -86,7 +86,7 @@ router.beforeEach((to, form, next) => {
} }
}); });
router.afterEach((to, form, next) => { router.afterEach((to, form, next) => {
NProgress.done(); // NProgress.done();
}); });
// 解决重复点击二级菜单报错的问题 // 解决重复点击二级菜单报错的问题
const originalPush = VueRouter.prototype.push; const originalPush = VueRouter.prototype.push;
......
src/views/Home.vue
View file @ 7540ffc3
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
}, },
created() { created() {
//获取妇幼权限和登录基本信息 //获取妇幼权限和登录基本信息
document.cookie = 'bGNnd3lwdF9hdA=47ae90f0-18e0-4553-9983-22213c9d378e;'//昆明市 document.cookie = 'bGNnd3lwdF9hdA=076213c2-e83a-46af-bd29-6c0a5af457fa;'//昆明市
// document.cookie = 'bGNnd3lwdF9hdA=' + sessionStorage.getItem("loginToken") + ';'//云南省 // document.cookie = 'bGNnd3lwdF9hdA=' + sessionStorage.getItem("loginToken") + ';'//云南省
let cookieToken = getCookie('bGNnd3lwdF9hdA'); let cookieToken = getCookie('bGNnd3lwdF9hdA');
console.log('tokenInfo',cookieToken) console.log('tokenInfo',cookieToken)
......
src/views/indexComponent/InformedConsent/InformedConsent.vue
View file @ 7540ffc3
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</a-col> </a-col>
</a-row> </a-row>
</a-form-model> </a-form-model>
<a-button style="margin-left: 36%" @click="backList">取消</a-button> <a-button class="ant-table-btn" style="margin-left: 36%" @click="backList">取消</a-button>
<a-button type="primary" style="margin-left: 20px" class="search_btn" <a-button type="primary" style="margin-left: 20px" class="search_btn"
@click="submitForm">保存 @click="submitForm">保存
</a-button> </a-button>
......
src/views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue
View file @ 7540ffc3
<template> <template>
<div> <div style="padding: 16px">
<a-card> <!-- <a-card>-->
<div> <div>
<div> <div>
<span style="font-size: 18px;font-weight: 600;"> 分配入库</span> <span style="font-size: 18px;font-weight: 600;"> 分配入库</span>
</div> </div>
<div style="margin-top: 16px"> <div style="margin-top: 16px">
<a-descriptions bordered :column="{ sm: 2, xs: 1 }"> <a-descriptions bordered :column="{ sm: 2, xs: 1 }" class="dis_title">
<a-descriptions-item label="发货单位"> <a-descriptions-item label="发货单位">
{{detailInfo.sendUnitName || '--'}} {{detailInfo.sendUnitName || '--'}}
</a-descriptions-item> </a-descriptions-item>
...@@ -42,32 +42,34 @@ ...@@ -42,32 +42,34 @@
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="入库状态"> <a-descriptions-item label="入库状态">
{{detailInfo.statusName || '--'}} <div :class="detailInfo.statusName == '待入库' ? 'ready_stock' : 'in_stock'">
<span> {{detailInfo.statusName || '--'}}</span>
</div>
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> </a-descriptions>
<a-form-model ref="formRef" :model="formData" <a-form-model ref="formRef" :model="formData"
:labelCol="{span: 4}" :labelCol="{span: 4}"
:wrapperCol="{span: 16}" :wrapperCol="{span: 13}"
style="margin-top: 20px" style="margin-top: 20px;"
> >
<a-form-model-item label="备注" <a-form-model-item label="备注"
prop="remarks" prop="remarks"
:labelCol="{span: 6}" :labelCol="{span: 5}"
:wrapperCol="{span: 15}"> :wrapperCol="{span: 12}">
<a-textarea <a-textarea
:rows="6" :rows="5"
v-toRemarkNum v-toRemarkNum
v-model="formData.remarks" v-model="formData.remarks"
placeholder="请输入备注"></a-textarea> placeholder="请输入备注(最多可输入200字)"></a-textarea>
</a-form-model-item> </a-form-model-item>
</a-form-model> </a-form-model>
</div> </div>
</div> </div>
<div style="text-align: center;margin-top: 40px"> <div style="text-align: center;">
<a-button @click="goBack(1)">取消</a-button> <a-button class="ant-table-btn" @click="goBack(1)">取消</a-button>
<a-button type="primary" @click="goBack(2)" style="margin-left: 10px">入库</a-button> <a-button type="primary" @click="goBack(2)" style="margin-left: 10px">入库</a-button>
</div> </div>
</a-card> <!-- </a-card>-->
</div> </div>
</template> </template>
<script> <script>
...@@ -120,6 +122,28 @@ ...@@ -120,6 +122,28 @@
}, },
} }
</script> </script>
<style lang="less" scoped> <style lang="less">
.dis_title {
.ant-descriptions-item-label {
width: 120px;
}
}
.ready_stock {
border-radius: 2px;
width: 62px;
text-align: center;
padding: 2px 8px;
background:#FFF7E6;
border: 1px solid #FFD591;
color: #FA8C16
}
.in_stock {
border-radius: 2px;
width: 62px;
text-align: center;
padding: 2px 8px;
/*background: lightgreen;*/
border: 1px solid #52C41A;
color: #52C41A
}
</style> </style>
src/views/indexComponent/distributionWarehousing/components/distributionWarehousingDetail.vue
View file @ 7540ffc3
<template> <template>
<div> <div>
<a-card> <div style="padding: 16px">
<div> <div>
<div> <div>
<span style="font-size: 18px;font-weight: 600;"> 分配入库详情</span> <span style="font-size: 18px;font-weight: 600;"> 分配入库详情</span>
</div> </div>
<div style="margin-top: 16px"> <div style="margin-top: 16px">
<a-descriptions bordered :column="{ sm: 2, xs: 1 }" class="dis_title"> <a-descriptions bordered :column="{ sm: 2, xs: 1 }" class="dis_title_local">
<a-descriptions-item label="发货单位"> <a-descriptions-item label="发货单位">
{{detailInfo.sendUnitName || '--'}} {{detailInfo.sendUnitName || '--'}}
</a-descriptions-item> </a-descriptions-item>
...@@ -46,6 +46,12 @@ ...@@ -46,6 +46,12 @@
<span> {{detailInfo.statusName || '--'}}</span> <span> {{detailInfo.statusName || '--'}}</span>
</div> </div>
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="入库操作人" v-if="detailInfo.status == 2">
{{detailInfo.receiver || '--'}}
</a-descriptions-item>
<a-descriptions-item label="入库时间" v-if="detailInfo.status == 2">
{{detailInfo.receiveDate || '--'}}
</a-descriptions-item>
</a-descriptions> </a-descriptions>
<a-form-model ref="formRef" <a-form-model ref="formRef"
:labelCol="{span: 4}" :labelCol="{span: 4}"
...@@ -54,7 +60,7 @@ ...@@ -54,7 +60,7 @@
> >
<a-form-model-item label="备注" <a-form-model-item label="备注"
prop="remarks" prop="remarks"
:labelCol="{span: 6}" :labelCol="{span: 5}"
:wrapperCol="{span: 15}"> :wrapperCol="{span: 15}">
<a-textarea <a-textarea
:disabled="true" :disabled="true"
...@@ -66,10 +72,10 @@ ...@@ -66,10 +72,10 @@
</a-form-model> </a-form-model>
</div> </div>
</div> </div>
<div style="text-align: center;margin-top: 40px"> <div style="text-align: center;margin-top: 16px">
<a-button @click="goBack">取消</a-button> <a-button class="ant-table-btn" @click="goBack">关闭</a-button>
</div> </div>
</a-card> </div>
</div> </div>
</template> </template>
<script> <script>
...@@ -100,25 +106,30 @@ ...@@ -100,25 +106,30 @@
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.dis_title {
.ant-descriptions-item-label {
width: 120px;
}
}
.ready_stock { .ready_stock {
width: 52px; border-radius: 2px;
width: 62px;
text-align: center; text-align: center;
padding: 3px 8px; padding: 2px 8px;
background:#FFF7E6; background:#FFF7E6;
border: 1px solid #FFD591; border: 1px solid #FFD591;
color: #FA8C16 color: #FA8C16
} }
.in_stock { .in_stock {
width: 52px; border-radius: 2px;
width: 62px;
text-align: center; text-align: center;
padding: 3px 8px; padding: 2px 8px;
background: #e4e7eb; /*background: lightgreen;*/
border: 1px solid greenyellow; border: 1px solid #52C41A;
color: #52C41A color: #52C41A
} }
</style> </style>
<style lang="less">
.dis_title_local {
.ant-descriptions-item-label {
width: 120px;
}
}
</style>
src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue
View file @ 7540ffc3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<template> <template>
<div class="distributionWarehousing"> <div class="distributionWarehousing">
<a-form layout="inline" class="search_form"> <a-form layout="inline" class="search_form">
<a-form-item label="接收状态"> <a-form-item label="入库状态">
<a-select v-model="searchForm.status" placeholder="请选择" style="width: 250px"> <a-select v-model="searchForm.status" placeholder="请选择" style="width: 250px">
<a-select-option value="">全部</a-select-option> <a-select-option value="">全部</a-select-option>
<a-select-option v-for="item in statusList" :key="item.enumValue" :value="item.enumValue"> <a-select-option v-for="item in statusList" :key="item.enumValue" :value="item.enumValue">
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<date-range-picker :date.sync="searchForm.date"></date-range-picker> <date-range-picker :date.sync="searchForm.date"></date-range-picker>
</a-form-item> </a-form-item>
<a-button type="primary" class="search_btn" icon="search" @click="searchList">搜索</a-button> <a-button type="primary" class="search_btn" icon="search" @click="searchList">搜索</a-button>
<a-button class="search_btn" style="margin-left: 10px" icon="sync" @click="restSearchForm">清空</a-button> <a-button class="search_btn ant-table-btn" style="margin-left: 10px" icon="sync" @click="restSearchForm">清空</a-button>
<!-- <a-button type="primary" class="search_btn" icon="download" style="float: right" @click="downloadExcel">--> <!-- <a-button type="primary" class="search_btn" icon="download" style="float: right" @click="downloadExcel">-->
<!-- 导出Excel--> <!-- 导出Excel-->
<!-- </a-button>--> <!-- </a-button>-->
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</template> </template>
<template slot="action" slot-scope="record"> <template slot="action" slot-scope="record">
<a-button type="link" size="small" @click="toDetail(record)">查看</a-button> <a-button type="link" size="small" @click="toDetail(record)">查看</a-button>
<a-button :disabled="record.status==2" type="link" size="small" @click="toAdd(record)">入库</a-button> <a-button :disabled="record.status==2" type="link" size="small" @click="toAdd(record)">入库</a-button>
</template> </template>
</a-table> </a-table>
<myPagination v-model="pagination" :pagination="pagination" @getList="getReceiveRecord"></myPagination> <myPagination v-model="pagination" :pagination="pagination" @getList="getReceiveRecord"></myPagination>
...@@ -53,11 +53,11 @@ ...@@ -53,11 +53,11 @@
dataIndex: 'sendNodeName', dataIndex: 'sendNodeName',
ellipsis: true ellipsis: true
}, },
{ // {
title: '供应商名称', // title: '供应商名称',
dataIndex: 'supplierName', // dataIndex: 'supplierName',
ellipsis: true // ellipsis: true
}, // },
{ {
title: '品牌', title: '品牌',
dataIndex: 'brandName', dataIndex: 'brandName',
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
ellipsis: true ellipsis: true
}, },
{ {
title: '接收状态', title: '入库状态',
dataIndex: 'statusName', dataIndex: 'statusName',
ellipsis: true ellipsis: true
}, },
......
src/views/indexComponent/distributionWarehousing/sendRecord.vue
View file @ 7540ffc3
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dateRangePicker :date.sync="searchForm.date"></dateRangePicker> <dateRangePicker :date.sync="searchForm.date"></dateRangePicker>
</a-form-item> </a-form-item>
<a-button type="primary" class="search_btn" icon="search" @click="searchList">搜索</a-button> <a-button type="primary" class="search_btn" icon="search" @click="searchList">搜索</a-button>
<a-button class="search_btn" style="margin-left: 10px" icon="sync" @click="restSearchForm">清空</a-button> <a-button class="search_btn ant-table-btn" style="margin-left: 10px" icon="sync" @click="restSearchForm">清空</a-button>
<!-- <a-button type="primary" class="search_btn" icon="download" style="float: right" @click="downloadExcel">--> <!-- <a-button type="primary" class="search_btn" icon="download" style="float: right" @click="downloadExcel">-->
<!-- 导出Excel--> <!-- 导出Excel-->
<!-- </a-button>--> <!-- </a-button>-->
...@@ -203,13 +203,13 @@ ...@@ -203,13 +203,13 @@
methods: { methods: {
getEnumListInfo() { getEnumListInfo() {
if (window.sessionStorage.getItem('allEnum')) { if (window.sessionStorage.getItem('allEnum')) {
this.statusList = getEnumByFlag("folacin_resident_info_status"); this.statusList = getEnumByFlag("folacin_stock_record_status");
} else { } else {
let par = {} let par = {}
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => { this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList)) window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo)); window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
this.statusList = getEnumByFlag("folacin_resident_info_status"); this.statusList = getEnumByFlag("folacin_stock_record_status");
}) })
} }
}, },
......
src/views/indexComponent/folviteApply/components/folviteApplyGrant.vue
View file @ 7540ffc3
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<a-card> <a-card>
<div> <div>
<div> <div>
<span style="font-size: 18px;font-weight: 600;"> 叶酸发放登记</span> <span style="font-size: 18px;font-weight: 600;color: #262626"> 叶酸发放登记</span>
</div> </div>
<div style="margin: 30px 0px"> <div style="margin: 30px 0px">
<div class="divider_my"><span class="midText">居民信息</span></div> <div class="divider_my"><span class="midText">居民信息</span></div>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
</a-table> </a-table>
</div> </div>
<div style="text-align: center;margin-top: 40px"> <div style="text-align: center;margin-top: 40px">
<a-button @click="goBack">关闭</a-button> <a-button class="ant-table-btn" @click="goBack">关闭</a-button>
</div> </div>
</a-card> </a-card>
</a-spin> </a-spin>
......
src/views/indexComponent/folviteApply/folviteApply.vue
View file @ 7540ffc3
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<a-input v-model="searchForm.telephone" placeholder="请输入联系电话" style="width: 250px"></a-input> <a-input v-model="searchForm.telephone" placeholder="请输入联系电话" style="width: 250px"></a-input>
</a-form-item> </a-form-item>
<a-button type="primary" icon="search" class="search_btn" @click="searchList">搜索</a-button> <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> <a-button class="search_btn ant-table-btn" icon="sync" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
<div style="clear: both"></div> <div style="clear: both"></div>
</a-form> </a-form>
...@@ -144,13 +144,13 @@ ...@@ -144,13 +144,13 @@
methods: { methods: {
getEnumListInfo() { getEnumListInfo() {
if (window.sessionStorage.getItem('allEnum')) { if (window.sessionStorage.getItem('allEnum')) {
this.statusList = getEnumByFlag("folacin_resident_info_status"); this.statusList = getEnumByFlag("folacin_resident_info_statuspc");
} else { } else {
let par = {} let par = {}
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => { this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList)) window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo)); window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
this.statusList = getEnumByFlag("folacin_resident_info_status"); this.statusList = getEnumByFlag("folacin_resident_info_statuspc");
}) })
} }
}, },
......
src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue
View file @ 7540ffc3
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<a-card> <a-card>
<div> <div>
<div> <div>
<span style="font-size: 18px;font-weight: 600;"> 叶酸发放登记</span> <span style="font-size: 18px;font-weight: 600;color: #262626"> 叶酸发放登记</span>
</div> </div>
<div style="margin: 30px 0px"> <div style="margin: 30px 0px">
<div class="divider_my"><span class="midText">居民信息</span></div> <div class="divider_my"><span class="midText">居民信息</span></div>
...@@ -67,16 +67,30 @@ ...@@ -67,16 +67,30 @@
<a-descriptions-item label="详细地址"> <a-descriptions-item label="详细地址">
{{detailInfo.nowAddress || '--'}} {{detailInfo.nowAddress || '--'}}
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="签署方式"> <a-descriptions-item label="签署方式" :span="routerParams.source == 2 ? 2: 1">
{{detailInfo.signedModeName || '--'}} {{detailInfo.signedModeName || '--'}}
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="签署日期"> <a-descriptions-item label="签署日期" :span="routerParams.source == 2 ? 2: 1">
{{detailInfo.parentDate || '--'}} {{detailInfo.parentDate || '--'}}
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="上传照片"> <a-descriptions-item label="上传照片" v-if="routerParams.source != 2">
<img width="120px" height="120px" :src="detailInfo.consentUrl"/> <img width="120px" height="120px" :src="detailInfo.consentUrl"/>
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> </a-descriptions>
<div class="card_info">
<a-card class="book" :headStyle="{background: '#FAFAFA'}" v-if="routerParams.source == 2">
<div slot="title" style="text-align: center;">
<span style="color: #262626;font-size: 14px">知情同意书</span>
</div>
<div>
<div v-html="bookHtmlContent.content">
</div>
</div>
</a-card>
</div>
<div v-if="routerParams.source == 2">
<img style="width: 100%;height: 160px" :src="detailInfo.applySignUrl">
</div>
<!-- <a-descriptions bordered layout="vertical" class="no_border">--> <!-- <a-descriptions bordered layout="vertical" class="no_border">-->
<!-- <a-descriptions-item label="上传照片">--> <!-- <a-descriptions-item label="上传照片">-->
<!-- {{detailInfo.batchNumber || '&#45;&#45;'}}--> <!-- {{detailInfo.batchNumber || '&#45;&#45;'}}-->
...@@ -95,9 +109,6 @@ ...@@ -95,9 +109,6 @@
<a-descriptions-item label="发放医生"> <a-descriptions-item label="发放医生">
{{detailInfo.provideDoctorName || '--'}} {{detailInfo.provideDoctorName || '--'}}
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="备注">
{{detailInfo.remarks || '--'}}
</a-descriptions-item>
</a-descriptions> </a-descriptions>
<div class="detail_title" style="border-top: 0px"> <div class="detail_title" style="border-top: 0px">
<div class="divider_my_dashed"> <div class="divider_my_dashed">
...@@ -112,9 +123,14 @@ ...@@ -112,9 +123,14 @@
bordered bordered
> >
</a-table> </a-table>
<a-descriptions bordered :column="1" class="remark_info folvite_title ">
<a-descriptions-item label="备注">
{{detailInfo.remarks || '--'}}
</a-descriptions-item>
</a-descriptions>
</div> </div>
<div style="text-align: center;margin-top: 40px"> <div style="text-align: center;margin-top: 40px">
<a-button @click="goBack">关闭</a-button> <a-button class="ant-table-btn" @click="goBack">关闭</a-button>
</div> </div>
</a-card> </a-card>
</a-spin> </a-spin>
...@@ -158,14 +174,25 @@ ...@@ -158,14 +174,25 @@
routerParams: {}, routerParams: {},
detailInfo: {}, detailInfo: {},
spinning: false, spinning: false,
bookHtmlContent: {content: undefined},
columns columns
} }
}, },
created() { created() {
this.routerParams = this.$route.query this.routerParams = this.$route.query
this.getStockListDetail() this.getStockListDetail()
this.getBookHtmlContent()
}, },
methods: { methods: {
getBookHtmlContent() {//获取用户知情书模板
this.$api.common.fetchConsentInfo().then(({data}) => {
if (this.$api.utils.isBlank(data)) {
this.bookHtmlContent = {content: ""}
} else {
this.bookHtmlContent = data;
}
})
},
getStockListDetail() { getStockListDetail() {
this.spinning = true this.spinning = true
let par = { let par = {
...@@ -195,9 +222,29 @@ ...@@ -195,9 +222,29 @@
.no_border { .no_border {
border-top: 0px; border-top: 0px;
} }
.folvite_title { .folvite_title {
.ant-descriptions-item-label { .ant-descriptions-item-label {
width: 140px; width: 135px;
}
}
.card_info{
.ant-card-head-title{
padding: 9px 0px!important;
}
.ant-card-head {
min-height: 32px;
}
.ant-card-bordered {
border-top: 0px!important;
border-bottom: 0px!important;
}
}
.remark_info {
.ant-descriptions-view {
.ant-descriptions-bordered .ant-descriptions-view {
border: 0px!important;
}
} }
} }
</style> </style>
src/views/indexComponent/folviteDistribution/components/inStockManageInfo.vue
View file @ 7540ffc3
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
:visible="visible" @cancel="visible = false" :visible="visible" @cancel="visible = false"
@ok="getChecked" @ok="getChecked"
:maskClosable="false" :maskClosable="false"
width="1100px" > width="1200px" >
<a-form layout="inline" class="search_form"> <a-form layout="inline" class="search_form">
<a-form-item label="供应商名称"> <a-form-item label="供应商名称">
<a-select v-model="searchForm.supplierId" placeholder="请选择" style="width: 250px"> <a-select v-model="searchForm.supplierId" placeholder="请选择" style="width: 250px">
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
@click="showSelectedMedical" @click="showSelectedMedical"
v-if="selectedRowKeys.length > 0" v-if="selectedRowKeys.length > 0"
> >
<a-popover v-model="selectedVisible" trigger="click" placement="bottomRight"> <a-popover v-model="selectedVisible" trigger="click" placement="bottomRight" style="background: #FFF1F0">
<div slot="content" style="min-width: 300px"> <div slot="content" style="min-width: 300px">
<div> <div>
<span style="padding: 5px 16px;color: #FF4D80">已选择叶酸({{selectedRowKeys.length}})</span> <span style="padding: 5px 16px;color: #FF4D80">已选择叶酸({{selectedRowKeys.length}})</span>
......
src/views/indexComponent/folviteDistribution/folviteDistribution.vue
View file @ 7540ffc3
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<a-button type="primary" icon="search" class="search_btn" style="margin-left: 10px" @click="searchList"> <a-button type="primary" icon="search" class="search_btn" style="margin-left: 10px" @click="searchList">
搜索 搜索
</a-button> </a-button>
<a-button class="search_btn" icon="close" style="margin-left: 10px" @click="restSearchForm">清空 <a-button class="search_btn ant-table-btn" icon="sync" style="margin-left: 10px" @click="restSearchForm">清空
</a-button> </a-button>
</a-form-item> </a-form-item>
<a-button type="primary" icon="plus" class="search_btn" style="float: right" @click="toAdd">发放登记</a-button> <a-button type="primary" icon="plus" class="search_btn" style="float: right" @click="toAdd">发放登记</a-button>
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<a-modal title="上传知情同意书" :visible="visible" @cancel="visible = false" @ok="onsubmit" <a-modal title="上传知情同意书" :visible="visible" @cancel="visible = false" @ok="onsubmit"
:maskClosable="false" :maskClosable="false"
width="600px"> width="600px">
<span>上传知情同意书:</span> <span>上传知情同意书：</span>
<a-upload <a-upload
style="display: inline" style="display: inline"
name="file" name="file"
...@@ -57,39 +57,37 @@ ...@@ -57,39 +57,37 @@
:file-list="fileList" :file-list="fileList"
> >
<div> <div>
<a-icon type="plus"/> <!--<a-icon type="plus"/>-->
<div class="ant-upload-text"> <div class="ant-upload-text">
上传本地文件 上传本地文件
</div> </div>
</div> </div>
</a-upload> </a-upload>
<div> <div>
<br> <br/>
温馨提示:请上传JPG、PNG格式图片，图片大小不超过5M 温馨提示:请上传JPG、PNG格式图片，图片大小不超过5M
<br> <br/>
<br>
</div> </div>
</a-modal> </a-modal>
<!--:getContainer="getContainer"-->
<a-modal title="查看知情同意书" :visible="showVisible" @cancel="showVisible = false" @ok="onsubmit" <a-modal title="查看知情同意书" :visible="showVisible" @cancel="showVisible = false" @ok="onsubmit"
loading="true"
:maskClosable="false" :maskClosable="false"
width="650px">
<div> width="600px">
<div v-if="currentRow.source==1"> <div v-if="currentRow.source==1">
<img style="width: 100%" :src="consentUrl" height="100%"/> <img style="width: 100%" :src="consentUrl" height="100%"/>
</div> </div>
<div v-else> <div v-else>
<div> <div style="white-space:pre;text-indent:2em">
<div v-html="consentInfo" style="white-space:pre"> <div v-html="consentInfo" style="white-space:pre">
</div> </div>
<div style="float: right"> <div style="float: right;margin-right: 10px">
<div style="height: 60px">签名: <img style="width:200px;height: 40px;" :src="applySignUrl" <div style="height: 60px">签名： <img style="width:200px;height: 40px;display: inline-block" :src="applySignUrl" height="100%"/></div>
height="100%"/></div> <div>签署日期：<span style="margin-left: 8px">{{currentRow.parentDate}}</span></div>
<div>签署日期:{{currentRow.parentDate}}</div>
<br><br>
<br><br> <br><br> <br><br>
</div>
<div style="height: 100px"></div>
</div> </div>
<div style="clear: both"></div>
</div> </div>
</div> </div>
</a-modal> </a-modal>
...@@ -181,7 +179,7 @@ ...@@ -181,7 +179,7 @@
showVisible: false, showVisible: false,
previewVisible: false, previewVisible: false,
consentUrl: "", consentUrl: "",
applySignUrl: "", applySignUrl:"",
consentInfo: "", consentInfo: "",
headers: { headers: {
Authorization: sessionStorage.getItem("token") Authorization: sessionStorage.getItem("token")
...@@ -241,11 +239,14 @@ ...@@ -241,11 +239,14 @@
} }
this.searchList() this.searchList()
}, },
// getContainer() {
// return window.parent.document.body
// },
toAdd() { toAdd() {
this.$router.push({path: '/folviteDistribution/add', query: {routerFlag: 'add'}}) this.$router.push({path: '/folviteDistribution/add', query: {routerFlag: 'add'}})
}, },
toDetail(record) { toDetail(record) {
this.$router.push({path: '/folviteDistribution/detail', query: {id: record.id}}) this.$router.push({path: '/folviteDistribution/detail', query: record})
}, },
uploadConsentInfo(row) { uploadConsentInfo(row) {
this.formData.id = row.id; this.formData.id = row.id;
......
src/views/indexComponent/inStockManage/components/addMaterialDistribution.vue
View file @ 7540ffc3
<template> <template>
<div class="addMaterialDistribution"> <div class="addMaterialDistribution">
<a-spin tip="加载中..." :spinning="spinning"> <a-spin tip="加载中..." :spinning="spinning">
<a-card> <div style="padding: 16px">
<div style="font-size: 18px;font-weight: 600"> <div style="font-size: 18px;font-weight: 600">
<span>调拨分配</span> <span>调拨分配</span>
</div> </div>
<a-form-model ref="formRef" :model="formData" :rules="formRules" :labelCol="{span: 7}" <a-form-model ref="formRef" :model="formData" :rules="formRules" :labelCol="{span: 7}"
:wrapperCol="{span: 15}"> :wrapperCol="{span: 15}">
<div> <div style="margin: 30px 0px">
<a-divider orientation="left"> <div class="divider_my"><span class="midText">分配信息</span></div>
分配信息 </div>
</a-divider> <div style="clear: both"></div>
</div>
<div> <div>
<a-row> <a-row>
<a-col :span="8"> <a-col :span="8">
...@@ -55,18 +54,17 @@ ...@@ -55,18 +54,17 @@
</a-col> </a-col>
</a-row> </a-row>
</div> </div>
<div> <div>
<a-divider orientation="left"> <div class="divider_my"><span class="midText">分配详情</span></div>
分配详情 </div>
</a-divider> <div style="clear: both"></div>
</div>
<a-table :dataSource="formData.detailedList" rowKey="id" :pagination="false" class="modal_table" <a-table :dataSource="formData.detailedList" rowKey="id" :pagination="false" class="modal_table"
bordered> bordered>
<a-table-column title="品牌" data-index="brandName"></a-table-column> <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="supplierName"></a-table-column>
<a-table-column title="批次号" data-index="batchNumber"></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="当前库存" data-index="number"></a-table-column>
<a-table-column title="分配数量" width="190px" fixed="right"> <a-table-column title="分配数量" width="190px">
<template slot-scope="text, record, index"> <template slot-scope="text, record, index">
<a-form-model-item :prop="'detailedList.' + index + '.sendNum'" <a-form-model-item :prop="'detailedList.' + index + '.sendNum'"
:rules="formRules.sendNum" class="tab_input_r"> :rules="formRules.sendNum" class="tab_input_r">
...@@ -74,7 +72,7 @@ ...@@ -74,7 +72,7 @@
v-toInt v-toInt
v-model="record.sendNum" v-model="record.sendNum"
placeholder="请输入分配数量" placeholder="请输入分配数量"
style="width: 150px;margin-top: 20px" style="width: 150px;"
@change="getChangeRecord(record)" @change="getChangeRecord(record)"
> >
...@@ -82,7 +80,7 @@ ...@@ -82,7 +80,7 @@
</a-form-model-item> </a-form-model-item>
</template> </template>
</a-table-column> </a-table-column>
<a-table-column title="操作" align="center" fixed="right" width="70px"> <a-table-column title="操作" align="center" width="70px">
<template slot-scope="text, record, index"> <template slot-scope="text, record, index">
<!-- <a-button type="link" class="table_delbtn" @click="deleteGoodsList(index)">删除</a-button> --> <!-- <a-button type="link" class="table_delbtn" @click="deleteGoodsList(index)">删除</a-button> -->
<a-popconfirm <a-popconfirm
...@@ -91,18 +89,18 @@ ...@@ -91,18 +89,18 @@
cancel-text="否" cancel-text="否"
@confirm="confirm(index)" @confirm="confirm(index)"
> >
<a href="#" class="table_delbtn">删除</a> <a-button class="ant-table-btn" size="small">删除</a-button>
</a-popconfirm> </a-popconfirm>
</template> </template>
</a-table-column> </a-table-column>
</a-table> </a-table>
</a-form-model> </a-form-model>
<div style="text-align: center;margin-top: 16px"> <div style="text-align: center;margin-top: 16px">
<a-button @click="goBack">取消</a-button> <a-button class="ant-table-btn" @click="goBack">取消</a-button>
<a-button type="primary" @click="addMaterialDis" :loading="subLoad" style="margin-left: 8px">调拨分配 <a-button type="primary" @click="addMaterialDis" :loading="subLoad" style="margin-left: 8px">调拨分配
</a-button> </a-button>
</div> </div>
</a-card> </div>
</a-spin> </a-spin>
</div> </div>
...@@ -255,9 +253,19 @@ ...@@ -255,9 +253,19 @@
</script> </script>
<style lang="less"> <style lang="less">
.detail_title {
padding: .1px 16px;
border: 1px solid #F0F0F0;
border-bottom: 0px
}
.addMaterialDistribution { .addMaterialDistribution {
.ant-table-thead > tr > th, .ant-table-tbody > tr > td { .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
padding: 10px !important; padding: 10px !important;
} }
} }
.modal_table {
.ant-form-item {
margin-bottom: 0px!important;
}
}
</style> </style>
src/views/indexComponent/inStockManage/components/addStock.vue
View file @ 7540ffc3
<template> <template>
<div class="inStockAdd"> <div class="inStockAdd">
<a-card style="height: 100vh"> <div style="height: 100vh;margin: 0 auto;padding: 16px">
<a-divider orientation="left"> <div style="margin: 30px 0px">
<span style="font-size: 16px;">叶酸库存录入</span> <div class="divider_my"><span class="midText">叶酸库存录入</span></div>
</a-divider> </div>
<div style="width:90%;margin: 0 auto;margin-top: 20px"> <div style="margin-top: 20px">
<a-form-model ref="formRef" :model="formData" :rules="formRules" <a-form-model ref="formRef" :model="formData" :rules="formRules"
:labelCol="{span: 6}" :labelCol="{span: 6}"
:wrapperCol="{span: 16}" :wrapperCol="{span: 16}"
...@@ -115,12 +115,12 @@ ...@@ -115,12 +115,12 @@
</a-form-model> </a-form-model>
</div> </div>
<div style="text-align: center"> <div style="text-align: center">
<a-button class="search_btn btn_space" @click="goBack">取消</a-button> <a-button class="search_btn btn_space ant-table-btn" @click="goBack">取消</a-button>
<a-button type="primary" class="search_btn btn_space" :loading="subLoad" style="margin-left: 10px" <a-button type="primary" class="search_btn btn_space" :loading="subLoad" style="margin-left: 10px"
@click="submitForm">库存录入 @click="submitForm">库存录入
</a-button> </a-button>
</div> </div>
</a-card> </div>
</div> </div>
</template> </template>
<script> <script>
......
src/views/indexComponent/inStockManage/components/inStockManageDetail.vue
View file @ 7540ffc3
<template> <template>
<div style="padding: 24px"> <div style="padding: 16px">
<div> <div>
<div> <div>
<span style="font-size: 18px;font-weight: 600;"> 药具详情</span> <span style="font-size: 18px;font-weight: 600;"> 库存详情</span>
</div> </div>
<div style="margin-top: 16px"> <div style="margin-top: 16px">
<a-descriptions bordered :column="{ sm: 2, xs: 1 }" class="detail_title"> <a-descriptions bordered :column="{ sm: 2, xs: 1 }" class="detail_title_stock">
<a-descriptions-item label="供应商"> <a-descriptions-item label="供应商">
{{detailInfo.supplierName || '--'}} {{detailInfo.supplierName || '--'}}
</a-descriptions-item> </a-descriptions-item>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</div> </div>
</div> </div>
<div style="text-align: center;margin-top: 40px"> <div style="text-align: center;margin-top: 40px">
<a-button @click="goBack">关闭</a-button> <a-button class="ant-table-btn" @click="goBack">关闭</a-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
} }
</script> </script>
<style lang="less"> <style lang="less">
.detail_title{ .detail_title_stock{
.ant-descriptions-item-label { .ant-descriptions-item-label {
width: 120px; width: 120px;
} }
......
src/views/indexComponent/inStockManage/inStockManage.vue
View file @ 7540ffc3
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<a-form-item label="入库日期"> <a-form-item label="入库日期">
<dateRangePicker :date.sync="searchForm.date"></dateRangePicker> <dateRangePicker :date.sync="searchForm.date"></dateRangePicker>
</a-form-item> </a-form-item>
<a-button type="primary" icon="search" class="search_btn" @click="searchList">搜索</a-button>
<a-button class="search_btn ant-table-btn" icon="sync" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
<!-- <div> <!-- <div>
<a-button type="primary" icon="plus" class="search_btn btn_space" @click="openModal">库存录入</a-button> <a-button type="primary" icon="plus" class="search_btn btn_space" @click="openModal">库存录入</a-button>
<a-button type="primary" icon="gift" class="search_btn btn_space" <a-button type="primary" icon="gift" class="search_btn btn_space"
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
@click="showSelectedMedical" @click="showSelectedMedical"
v-if="selectedRowKeys.length > 0" v-if="selectedRowKeys.length > 0"
> >
<a-popover v-model="selectedVisible" trigger="click" placement="bottomRight"> <a-popover v-model="selectedVisible" trigger="click" placement="bottomRight" style="background: #FFF1F0">
<div slot="content" style="min-width: 300px"> <div slot="content" style="min-width: 300px">
<div> <div>
<span style="padding: 5px 16px;color: #FF4D80">已选择叶酸({{selectedRowKeys.length}})</span> <span style="padding: 5px 16px;color: #FF4D80">已选择叶酸({{selectedRowKeys.length}})</span>
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
<a-list <a-list
item-layout="horizontal" item-layout="horizontal"
:data-source="selectedRowList" :data-source="selectedRowList"
class="des_list"
> >
<a-list-item slot="renderItem" slot-scope="item, index"> <a-list-item slot="renderItem" slot-scope="item, index">
<a slot="actions" @click="delSelectedKey(index)">删除</a> <a slot="actions" @click="delSelectedKey(index)">删除</a>
...@@ -71,10 +72,6 @@ ...@@ -71,10 +72,6 @@
</a-popover> </a-popover>
</div> </div>
</div> </div>
<div>
<a-button type="primary" icon="search" class="search_btn" @click="searchList">搜索</a-button>
<a-button class="search_btn" icon="sync" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
</div>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>
<a-table :dataSource="tableData" <a-table :dataSource="tableData"
...@@ -92,7 +89,7 @@ ...@@ -92,7 +89,7 @@
</template> </template>
<template slot="action" slot-scope="record"> <template slot="action" slot-scope="record">
<!--<a-button type="link" size="small" @click="openChildModal(record)">人工发放</a-button>--> <!--<a-button type="link" size="small" @click="openChildModal(record)">人工发放</a-button>-->
<a-button type="link" size="small" @click="toDetail(record)">查看</a-button> <a-button class="ant-table-btn" size="small" @click="toDetail(record)">查看</a-button>
</template> </template>
</a-table> </a-table>
<a-pagination <a-pagination
...@@ -195,7 +192,7 @@ ...@@ -195,7 +192,7 @@
selectedVisible: false, selectedVisible: false,
selectedRowList: [], selectedRowList: [],
routerParams: {}, routerParams: {},
unitInfo: JSON.parse(sessionStorage.getItem("unitInfo")) unitInfo: {}
} }
}, },
created() { created() {
...@@ -211,11 +208,14 @@ ...@@ -211,11 +208,14 @@
getEnumListInfo() { getEnumListInfo() {
if (window.sessionStorage.getItem('allEnum')) { if (window.sessionStorage.getItem('allEnum')) {
this.brandList = getEnumByFlag("folacin_stock_record_brand_id"); this.brandList = getEnumByFlag("folacin_stock_record_brand_id");
this.unitInfo = JSON.parse(sessionStorage.getItem("unitInfo"))
} else { } else {
let par = {} let par = {}
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => { this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
window.sessionStorage.setItem('unitInfo', JSON.stringify(data.unitInfo));
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList)) window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo)); window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
this.unitInfo = data.unitInfo
this.brandList = getEnumByFlag("folacin_stock_record_brand_id"); this.brandList = getEnumByFlag("folacin_stock_record_brand_id");
}) })
} }
...@@ -338,3 +338,11 @@ ...@@ -338,3 +338,11 @@
padding: 30px; padding: 30px;
}*/ }*/
</style> </style>
<style lang="less">
.des_list {
.ant-list-item-meta-description {
color: rgba(0,0,0,.7);
}
}
</style>
src/views/indexComponent/stockTransfer/stockTransfer.vue
View file @ 7540ffc3
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<dateRangePicker :date.sync="searchForm.date"></dateRangePicker> <dateRangePicker :date.sync="searchForm.date"></dateRangePicker>
</a-form-item> </a-form-item>
<a-button type="primary" class="search_btn" icon="search" @click="searchList">搜索</a-button> <a-button type="primary" class="search_btn" icon="search" @click="searchList">搜索</a-button>
<a-button class="search_btn" style="margin-left: 10px" icon="close" @click="restSearchForm">清空</a-button> <a-button class="search_btn ant-table-btn" style="margin-left: 10px" icon="sync" @click="restSearchForm">清空</a-button>
<!-- <a-button type="primary" class="search_btn" icon="download" style="float: right" @click="downloadExcel">--> <!-- <a-button type="primary" class="search_btn" icon="download" style="float: right" @click="downloadExcel">-->
<!-- 导出Excel--> <!-- 导出Excel-->
<!-- </a-button>--> <!-- </a-button>-->
......
src/views/indexComponent/supplyManage/supplyManage.vue
View file @ 7540ffc3
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</a-form-item> </a-form-item>
<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 type="primary" icon="search" class="search_btn" style="margin-left: 10px" @click="searchList">搜索</a-button>
<a-button class="search_btn" icon="close" style="margin-left: 10px" @click="restSearchForm">清空</a-button> <a-button class="search_btn ant-table-btn" icon="sync" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
</a-form-item> </a-form-item>
<a-button type="primary" icon="plus" class="search_btn" style="float: right" @click="toAdd">添加供应商</a-button> <a-button type="primary" icon="plus" class="search_btn" style="float: right" @click="toAdd">添加供应商</a-button>
<div style="clear: both"></div> <div style="clear: both"></div>
......
static/css/global.less
View file @ 7540ffc3
...@@ -248,7 +248,7 @@ html, body, #app { ...@@ -248,7 +248,7 @@ html, body, #app {
} }
.ant-descriptions-bordered .ant-descriptions-item-label, .ant-descriptions-bordered .ant-descriptions-item-content { .ant-descriptions-bordered .ant-descriptions-item-label, .ant-descriptions-bordered .ant-descriptions-item-content {
padding: 10px 24px!important; padding: 13px 16px!important;
} }
.ant-pagination-item-active { .ant-pagination-item-active {
......
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