Skip to content

F
folacin-front
Commit 3544fa15 authored by gengchunlei's avatar gengchunlei
Browse files
Options

叶酸样式修改

parent f85bb404
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 81 deletions
src/router/index.js
View file @ 3544fa15
......@@ -64,7 +64,7 @@ const router = new VueRouter({
// 路由守卫
router.beforeEach((to, form, next) => {
NProgress.start();
// NProgress.start();
// if (to.path === '/Home/folviteIndex') {
return next();
// };
......@@ -86,7 +86,7 @@ router.beforeEach((to, form, next) => {
}
});
router.afterEach((to, form, next) => {
NProgress.done();
// NProgress.done();
});
// 解决重复点击二级菜单报错的问题
const originalPush = VueRouter.prototype.push;
......
src/views/Home.vue
View file @ 3544fa15
......@@ -54,7 +54,7 @@
},
created() {
//获取妇幼权限和登录基本信息
document.cookie = 'bGNnd3lwdF9hdA=47ae90f0-18e0-4553-9983-22213c9d378e;'//昆明市
document.cookie = 'bGNnd3lwdF9hdA=076213c2-e83a-46af-bd29-6c0a5af457fa;'//昆明市
// document.cookie = 'bGNnd3lwdF9hdA=' + sessionStorage.getItem("loginToken") + ';'//云南省
let cookieToken = getCookie('bGNnd3lwdF9hdA');
console.log('tokenInfo',cookieToken)
......
src/views/indexComponent/InformedConsent/InformedConsent.vue
View file @ 3544fa15
......@@ -11,7 +11,7 @@
</a-col>
</a-row>
</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"
@click="submitForm">保存
</a-button>
......
src/views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue
View file @ 3544fa15
<template>
<div style="padding: 15px">
<div style="padding: 16px">
<!-- <a-card>-->
<div>
<div>
......@@ -50,11 +50,11 @@
<a-form-model ref="formRef" :model="formData"
:labelCol="{span: 4}"
:wrapperCol="{span: 13}"
style="margin-top: 20px"
style="margin-top: 20px;"
>
<a-form-model-item label="备注"
prop="remarks"
:labelCol="{span: 6}"
:labelCol="{span: 5}"
:wrapperCol="{span: 12}">
<a-textarea
:rows="5"
......@@ -65,8 +65,8 @@
</a-form-model>
</div>
</div>
<div style="text-align: center;margin-top: 40px">
<a-button @click="goBack(1)">取消</a-button>
<div style="text-align: center;">
<a-button class="ant-table-btn" @click="goBack(1)">取消</a-button>
<a-button type="primary" @click="goBack(2)" style="margin-left: 10px">入库</a-button>
</div>
<!-- </a-card>-->
......
src/views/indexComponent/distributionWarehousing/components/distributionWarehousingDetail.vue
View file @ 3544fa15
<template>
<div>
<a-card>
<div style="padding: 16px">
<div>
<div>
<span style="font-size: 18px;font-weight: 600;"> 分配入库详情</span>
</div>
<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="发货单位">
{{detailInfo.sendUnitName || '--'}}
</a-descriptions-item>
......@@ -46,6 +46,12 @@
<span> {{detailInfo.statusName || '--'}}</span>
</div>
</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-form-model ref="formRef"
:labelCol="{span: 4}"
......@@ -54,7 +60,7 @@
>
<a-form-model-item label="备注"
prop="remarks"
:labelCol="{span: 6}"
:labelCol="{span: 5}"
:wrapperCol="{span: 15}">
<a-textarea
:disabled="true"
......@@ -66,10 +72,10 @@
</a-form-model>
</div>
</div>
<div style="text-align: center;margin-top: 40px">
<a-button @click="goBack">取消</a-button>
<div style="text-align: center;margin-top: 16px">
<a-button class="ant-table-btn" @click="goBack">关闭</a-button>
</div>
</a-card>
</div>
</div>
</template>
<script>
......@@ -100,11 +106,6 @@
}
</script>
<style lang="less" scoped>
.dis_title {
.ant-descriptions-item-label {
width: 120px;
}
}
.ready_stock {
border-radius: 2px;
width: 62px;
......@@ -124,3 +125,11 @@
color: #52C41A
}
</style>
<style lang="less">
.dis_title_local {
.ant-descriptions-item-label {
width: 120px;
}
}
</style>
src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue
View file @ 3544fa15
......@@ -2,7 +2,7 @@
<template>
<div class="distributionWarehousing">
<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-option value="">全部</a-select-option>
<a-select-option v-for="item in statusList" :key="item.enumValue" :value="item.enumValue">
......@@ -34,7 +34,7 @@
</template>
<template slot="action" slot-scope="record">
<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>
</a-table>
<myPagination v-model="pagination" :pagination="pagination" @getList="getReceiveRecord"></myPagination>
......@@ -53,11 +53,11 @@
dataIndex: 'sendNodeName',
ellipsis: true
},
{
title: '供应商名称',
dataIndex: 'supplierName',
ellipsis: true
},
// {
// title: '供应商名称',
// dataIndex: 'supplierName',
// ellipsis: true
// },
{
title: '品牌',
dataIndex: 'brandName',
......@@ -93,7 +93,7 @@
ellipsis: true
},
{
title: '接收状态',
title: '入库状态',
dataIndex: 'statusName',
ellipsis: true
},
......
src/views/indexComponent/distributionWarehousing/sendRecord.vue
View file @ 3544fa15
......@@ -204,13 +204,13 @@
methods: {
getEnumListInfo() {
if (window.sessionStorage.getItem('allEnum')) {
this.statusList = getEnumByFlag("folacin_resident_info_status");
this.statusList = getEnumByFlag("folacin_stock_record_status");
} else {
let par = {}
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
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 @ 3544fa15
......@@ -5,7 +5,7 @@
<a-card>
<div>
<div>
<span style="font-size: 18px;font-weight: 600;"> 叶酸发放登记</span>
<span style="font-size: 18px;font-weight: 600;color: #262626"> 叶酸发放登记</span>
</div>
<div style="margin: 30px 0px">
<div class="divider_my"><span class="midText">居民信息</span></div>
......@@ -112,7 +112,7 @@
</a-table>
</div>
<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>
</a-card>
</a-spin>
......
src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue
View file @ 3544fa15
......@@ -4,7 +4,7 @@
<a-card>
<div>
<div>
<span style="font-size: 18px;font-weight: 600;"> 叶酸发放登记</span>
<span style="font-size: 18px;font-weight: 600;color: #262626"> 叶酸发放登记</span>
</div>
<div style="margin: 30px 0px">
<div class="divider_my"><span class="midText">居民信息</span></div>
......@@ -130,7 +130,7 @@
</a-descriptions>
</div>
<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>
</a-card>
</a-spin>
......
src/views/indexComponent/folviteDistribution/components/inStockManageInfo.vue
View file @ 3544fa15
......@@ -5,7 +5,7 @@
:visible="visible" @cancel="visible = false"
@ok="getChecked"
:maskClosable="false"
width="1100px" >
width="1200px" >
<a-form layout="inline" class="search_form">
<a-form-item label="供应商名称">
<a-select v-model="searchForm.supplierId" placeholder="请选择" style="width: 250px">
......@@ -32,7 +32,7 @@
@click="showSelectedMedical"
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>
<span style="padding: 5px 16px;color: #FF4D80">已选择叶酸({{selectedRowKeys.length}})</span>
......
src/views/indexComponent/folviteDistribution/folviteDistribution.vue
View file @ 3544fa15
......@@ -43,7 +43,7 @@
<a-modal title="上传知情同意书" :visible="visible" @cancel="visible = false" @ok="onsubmit"
:maskClosable="false"
width="600px">
<span>上传知情同意书:</span>
<span>上传知情同意书：</span>
<a-upload
style="display: inline"
name="file"
......@@ -57,36 +57,37 @@
:file-list="fileList"
>
<div>
<a-icon type="plus"/>
<!--<a-icon type="plus"/>-->
<div class="ant-upload-text">
上传本地文件
</div>
</div>
</a-upload>
<div>
<br>
<br/>
温馨提示:请上传JPG、PNG格式图片，图片大小不超过5M
<br>
<br>
<br/>
</div>
</a-modal>
<!--:getContainer="getContainer"-->
<a-modal title="查看知情同意书" :visible="showVisible" @cancel="showVisible = false" @ok="onsubmit"
loading="true"
:maskClosable="false"
width="600px">
<div v-if="currentRow.source==1">
<img style="width: 100%" :src="consentUrl" height="100%"/>
</div>
<div v-else>
<div style="float: right;white-space:pre;text-indent:2em">
<div style="white-space:pre;text-indent:2em">
<div v-html="consentInfo" style="white-space:pre">
</div>
<div style="float: right">
<div style="height: 60px">签名: <img style="width:200px;height: 40px;" :src="applySignUrl" height="100%"/></div>
<div>签署日期:{{currentRow.parentDate}}</div>
<br><br>
<div style="float: right;margin-right: 10px">
<div style="height: 60px">签名： <img style="width:200px;height: 40px;display: inline-block" :src="applySignUrl" height="100%"/></div>
<div>签署日期：<span style="margin-left: 8px">{{currentRow.parentDate}}</span></div>
</div>
<div style="clear: both"></div>
</div>
</div>
</a-modal>
......@@ -238,11 +239,14 @@
}
this.searchList()
},
// getContainer() {
// return window.parent.document.body
// },
toAdd() {
this.$router.push({path: '/folviteDistribution/add', query: {routerFlag: 'add'}})
},
toDetail(record) {
this.$router.push({path: '/folviteDistribution/detail', query: {id: record.id}})
this.$router.push({path: '/folviteDistribution/detail', query: record})
},
uploadConsentInfo(row) {
this.formData.id = row.id;
......
src/views/indexComponent/inStockManage/components/addMaterialDistribution.vue
View file @ 3544fa15
<template>
<div class="addMaterialDistribution">
<a-spin tip="加载中..." :spinning="spinning">
<a-card>
<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}">
<div>
<a-divider orientation="left">
分配信息
</a-divider>
</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">
......@@ -55,18 +54,17 @@
</a-col>
</a-row>
</div>
<div>
<a-divider orientation="left">
分配详情
</a-divider>
</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>
<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">
<a-table-column title="分配数量" width="190px">
<template slot-scope="text, record, index">
<a-form-model-item :prop="'detailedList.' + index + '.sendNum'"
:rules="formRules.sendNum" class="tab_input_r">
......@@ -74,7 +72,7 @@
v-toInt
v-model="record.sendNum"
placeholder="请输入分配数量"
style="width: 150px;margin-top: 20px"
style="width: 150px;"
@change="getChangeRecord(record)"
>
......@@ -82,7 +80,7 @@
</a-form-model-item>
</template>
</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">
<!-- <a-button type="link" class="table_delbtn" @click="deleteGoodsList(index)">删除</a-button> -->
<a-popconfirm
......@@ -91,18 +89,18 @@
cancel-text="否"
@confirm="confirm(index)"
>
<a href="#" class="table_delbtn">删除</a>
<a-button class="ant-table-btn" size="small">删除</a-button>
</a-popconfirm>
</template>
</a-table-column>
</a-table>
</a-form-model>
<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>
</div>
</a-card>
</div>
</a-spin>
</div>
......@@ -265,4 +263,9 @@
padding: 10px !important;
}
}
.modal_table {
.ant-form-item {
margin-bottom: 0px!important;
}
}
</style>
src/views/indexComponent/inStockManage/components/addStock.vue
View file @ 3544fa15
......@@ -115,7 +115,7 @@
</a-form-model>
</div>
<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"
@click="submitForm">库存录入
</a-button>
......
src/views/indexComponent/inStockManage/components/inStockManageDetail.vue
View file @ 3544fa15
<template>
<div style="padding: 24px">
<div style="padding: 16px">
<div>
<div>
<span style="font-size: 18px;font-weight: 600;"> 药具详情</span>
<span style="font-size: 18px;font-weight: 600;"> 库存详情</span>
</div>
<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="供应商">
{{detailInfo.supplierName || '--'}}
</a-descriptions-item>
......@@ -41,7 +41,7 @@
</div>
</div>
<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>
</template>
......@@ -76,7 +76,7 @@
}
</script>
<style lang="less">
.detail_title{
.detail_title_stock{
.ant-descriptions-item-label {
width: 120px;
}
......
src/views/indexComponent/inStockManage/inStockManage.vue
View file @ 3544fa15
......@@ -20,8 +20,8 @@
<a-form-item label="入库日期">
<dateRangePicker :date.sync="searchForm.date"></dateRangePicker>
</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>
<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"
......@@ -46,7 +46,7 @@
@click="showSelectedMedical"
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>
<span style="padding: 5px 16px;color: #FF4D80">已选择叶酸({{selectedRowKeys.length}})</span>
......@@ -55,6 +55,7 @@
<a-list
item-layout="horizontal"
:data-source="selectedRowList"
class="des_list"
>
<a-list-item slot="renderItem" slot-scope="item, index">
<a slot="actions" @click="delSelectedKey(index)">删除</a>
......@@ -71,10 +72,6 @@
</a-popover>
</div>
</div>
<div>
<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>
<div style="clear: both"></div>
<a-table :dataSource="tableData"
......@@ -92,7 +89,7 @@
</template>
<template slot="action" slot-scope="record">
<!--<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>
</a-table>
<a-pagination
......@@ -195,7 +192,7 @@
selectedVisible: false,
selectedRowList: [],
routerParams: {},
unitInfo: JSON.parse(sessionStorage.getItem("unitInfo"))
unitInfo: {}
}
},
created() {
......@@ -211,11 +208,14 @@
getEnumListInfo() {
if (window.sessionStorage.getItem('allEnum')) {
this.brandList = getEnumByFlag("folacin_stock_record_brand_id");
this.unitInfo = JSON.parse(sessionStorage.getItem("unitInfo"))
} else {
let par = {}
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('userInfo', JSON.stringify(data.userInfo));
this.unitInfo = data.unitInfo
this.brandList = getEnumByFlag("folacin_stock_record_brand_id");
})
}
......@@ -338,3 +338,11 @@
padding: 30px;
}*/
</style>
<style lang="less">
.des_list {
.ant-list-item-meta-description {
color: rgba(0,0,0,.7);
}
}
</style>
static/css/global.less
View file @ 3544fa15
......@@ -248,7 +248,7 @@ html, body, #app {
}
.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 {
......
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