Skip to content

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

更换域名

parent d425e767
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 149 deletions
folacin-app/.env.prod
View file @ 6bc360dc
NODE_ENV = prod
VUE_APP_BASE_URL = https://ys-service.yiboshi.com
\ No newline at end of file
VUE_APP_BASE_URL = https://ys-service.zmnyjk.com
\ No newline at end of file
folacin-app/src/views/applyRecord/applyRecord.vue
View file @ 6bc360dc
......@@ -34,7 +34,7 @@
</div>
<div class="bottom_back" v-if="index != detailList.length-1"></div>
</div>
</template>
<van-empty v-else description="暂无申请记录" />
</div>
......@@ -105,14 +105,14 @@ export default {
height: 100%;
// height: calc(100% - 50px);
background-color: #F1F1F1;
.apply_block {
margin-top: 8px;
height: 180px;
background-color: #fff;
padding: 0 16px;
box-sizing: border-box;
.top {
display: flex;
......@@ -133,7 +133,7 @@ export default {
margin: 13px 0 8px 0;
}
.green {
background-color: #79BC7F;
}
.orange {
......
folacin-pc/.env.dev
View file @ 6bc360dc
NODE_ENV = dev
VUE_APP_BASE_URL111= https://beta-ysservice.yiboshi.com
VUE_APP_BASE_URL2 = https://ys-service.yiboshi.com
VUE_APP_BASE_URL2222= https://beta-ysservice.yiboshi.com
VUE_APP_BASE_URL22 = https://ys-service.yiboshi.com
VUE_APP_BASE_URL4 = http://59.230.237.90:8115
VUE_APP_BASE_URL = http://127.0.0.1:8083
VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
......
folacin-pc/.env.prod
View file @ 6bc360dc
NODE_ENV = prod
VUE_APP_BASE_URL = https://ys-service.yiboshi.com
VUE_APP_BASE_PATH = https://lcgwypt-login.yiboshi.com
VUE_APP_BASE_URL = https://ys-service.zmnyjk.com
VUE_APP_BASE_PATH = https://lcgwypt-login.zmnyjk.com
VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'
VUE_APP_LOCATION = https://yesuan.yiboshi.com/#/
VUE_APP_LOCATION = https://yesuan.zmnyjk.com/#/
folacin-pc/src/api/fetch.js
View file @ 6bc360dc
......@@ -14,7 +14,7 @@ function fetch(url = '', params = {}, method = 'get', contentType = 'form', toke
let keyArr = [];
for (let k in params) {
let val = params[k];
if (val === null || val === undefined || val === 'null' || val === '' || val === ' ') {
if (val === null || val === undefined || val === 'null' || val === ' ') {
keyArr.push(k);
}
}
......@@ -44,9 +44,11 @@ function fetch(url = '', params = {}, method = 'get', contentType = 'form', toke
}
}).then(function (response) {
if (response.data.code === 'BIZ.TOKEN_EXPIRATION') {
console.log('没有token接口返回');
window.top.postMessage({messageType: "LOGOUT"}, '*');
return
message.error(response.data.msg);
// if (process.env.NODE_ENV != "dev") {
// window.top.postMessage({messageType: "LOGOUT"}, '*');
// return
// }
}
if (response.data.code === 'BIZ.BUSSINESS_EXCEPTION') {
message.error(response.data.msg);
......
folacin-pc/src/api/index.js
View file @ 6bc360dc
......@@ -214,6 +214,9 @@ export default {
fetchLastRecord(idCard) {//查询最近一次发放记录
return fetch(`/v1/folacin-admin/folacin-resident-info/resident/${idCard}`)
},
fetchResidentByCard(params) {//查询最近一次发放记录
return fetch(`/v1/folacin-admin/folacin-resident-info/resident-by-card`,params)
},
},
//物资调拨管理
allocationManagement: {
......
folacin-pc/src/router/index.js
View file @ 6bc360dc
......@@ -6,7 +6,7 @@ import storeInfo from '../store/index'
// 进度条
import NProgress from 'nprogress';
let activeUrl = window.sessionStorage.getItem('activeItem') || '/Home/inStock';
let activeUrl = window.sessionStorage.getItem('activeItem') || '/Home/folviteDistribution';
NProgress.configure({showSpinner: false});
Vue.use(VueRouter)
......@@ -53,6 +53,13 @@ const routes = [
{path: '/folviteApply/grant', name: '叶酸申请发放', component: () => import('../views/indexComponent/folviteApply/components/folviteApplyGrant.vue')},
//供应商管理
{path: '/supplyManage/add', name: '新增供应商', component: () => import('../views/indexComponent/supplyManage/components/addSupply.vue')},
{
path: '/thirdPage',
component: () => import('../views/third/residentInfo.vue'),
children: [
{path: 'residentGrantInfo', name: '首页', component: () => import('../views/third/residentInfo.vue')},
],
},
]
const router = new VueRouter({
......
folacin-pc/src/views/Home.vue
View file @ 6bc360dc
......@@ -3,7 +3,8 @@
<a-layout>
<a-layout-content class="layout_container" style="background: #fff">
<div style="padding: 10px;">
<a-tabs type="card" :tabBarGutter="10" v-if="systemType" v-model="$store.state.activeKeyInfo" @change="onChange">
<a-tabs type="card" :tabBarGutter="10" v-if="systemType" v-model="$store.state.activeKeyInfo"
@change="onChange">
<a-tab-pane v-for="(item, index) in menuList" :key="item.frontActionUrl">
<span slot="tab">
<span>{{ item.name }}<span>(0)</span></span>
......@@ -24,98 +25,105 @@
</a-layout>
</template>
<script>
import {getCookie} from "./utils/common";
import {menuTest} from "./utils/testDate";
export default {
data() {
return {
// 菜单
menuList:[],
// 选中的菜单
activeItem: [],
// tabs标签
tabs: [],
// 选中的tabs标签
activeKey: '',
showChildren: false,
menuTest,
unitInfo:{},
systemType: sessionStorage.getItem("systemType")
}
},
created() {
//获取妇幼权限和登录基本信息
//document.cookie = 'bGNnd3lwdF9hdA=6a84c8f3-86b3-42dc-835c-95e8b26ce568;'
let cookieToken = getCookie('bGNnd3lwdF9hdA');
if (cookieToken) {
window.sessionStorage.setItem('token', 'bearer' + ' ' + cookieToken);
let query=this.$route.query;
let par = {menuId:query.menuId};
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
this.unitInfo = data.unitInfo;
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList));
window.sessionStorage.setItem('unitInfo', JSON.stringify(data.unitInfo));
this.setInitMenuInfo()
this.showChildren = true
})
} else {
window.top.postMessage({messageType:"LOGOUT"}, '*')//给最顶层窗口发送token失效通知
}
import {getCookie} from "./utils/common";
import {menuTest} from "./utils/testDate";
export default {
data() {
return {
// 菜单
menuList: [],
// 选中的菜单
activeItem: [],
// tabs标签
tabs: [],
// 选中的tabs标签
activeKey: '',
showChildren: false,
menuTest,
unitInfo: {},
systemType: sessionStorage.getItem("systemType")
}
},
created() {
//获取妇幼权限和登录基本信息
let cookieToken = "29cc399b-af98-4fbd-8984-ecbd97f125b7";
if (process.env.NODE_ENV != "dev") {
cookieToken = getCookie('bGNnd3lwdF9hdA');
}
if (cookieToken) {
window.sessionStorage.setItem('token', 'bearer' + ' ' + cookieToken);
let query = this.$route.query;
let par = {menuId: query.menuId};
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
this.unitInfo = data.unitInfo;
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList));
window.sessionStorage.setItem('unitInfo', JSON.stringify(data.unitInfo));
this.setInitMenuInfo()
this.showChildren = true
})
} else {
window.top.postMessage({messageType: "LOGOUT"}, '*')//给最顶层窗口发送token失效通知
}
},
methods: {
setInitMenuInfo() {//设置默认菜单和菜单缓存
this.menuList = this.menuTest;
},
methods: {
setInitMenuInfo() {//设置默认菜单和菜单缓存
this.menuList = this.menuTest;
},
// 点击tabs标签
onChange(activeKey) {
this.activeKey = activeKey;
window.sessionStorage.setItem('activeKey', this.activeKey);
this.$store.commit('changeActKey', this.activeKey)
console.log( this.$store.state.tabsInfo);
this.menuList.forEach((item, i) => {
console.log(item.frontActionUrl,item)
if (item.frontActionUrl === activeKey) {
this.activeItem = [item.frontActionUrl];
window.sessionStorage.setItem('activeItem', this.activeItem);
this.$router.push(item.frontActionUrl);
}
});
},
// 点击tabs标签
onChange(activeKey) {
this.activeKey = activeKey;
window.sessionStorage.setItem('activeKey', this.activeKey);
this.$store.commit('changeActKey', this.activeKey)
console.log(this.$store.state.tabsInfo);
this.menuList.forEach((item, i) => {
console.log(item.frontActionUrl, item)
if (item.frontActionUrl === activeKey) {
this.activeItem = [item.frontActionUrl];
window.sessionStorage.setItem('activeItem', this.activeItem);
this.$router.push(item.frontActionUrl);
}
});
},
}
},
}
</script>
<style lang="less">
.index_body {
.ant-tabs-bar {
border-bottom: 1px solid rgba(255,77,128,.2)!important;
}
.ant-tabs-nav-scroll {
margin-left: 0px!important;
}
.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container {
height: 35px!important;
}
.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab {
height: 35px!important;
color: #F8F8FF!important;
line-height: 35px!important;
background: rgba(255,77,128, .5);
border-bottom: 0px solid #FF4D80;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
}
.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active {
height: 35px!important;
color: #fff;
background: #FF4D80;
border-color: #FF4D80;
border-bottom: 0px solid #FF4D80;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
}
.index_body {
.ant-tabs-bar {
border-bottom: 1px solid rgba(255, 77, 128, .2) !important;
}
.ant-tabs-nav-scroll {
margin-left: 0px !important;
}
.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container {
height: 35px !important;
}
.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab {
height: 35px !important;
color: #F8F8FF !important;
line-height: 35px !important;
background: rgba(255, 77, 128, .5);
border-bottom: 0px solid #FF4D80;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
}
.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active {
height: 35px !important;
color: #fff;
background: #FF4D80;
border-color: #FF4D80;
border-bottom: 0px solid #FF4D80;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
}
}
</style>
folacin-pc/src/views/indexComponent/folviteApply/folviteApply.vue
View file @ 6bc360dc
......@@ -90,21 +90,26 @@ const columns = [
// },
{
title: '申领数量',
width: '100px',
width: '120px',
dataIndex: 'provideNumber'
},
{
title: '联系电话',
dataIndex: 'telephone',
width: '180px'
width: '120px'
},
{
title: '领取状态',
dataIndex: 'statusName',
width: '100px'
width: '120px'
},
{
title: '申请日期',
dataIndex: 'created',
width: '120px'
},
{
title: '领取日期',
title: '发放日期',
dataIndex: 'provideDate',
width: '120px'
},
......
folacin-pc/src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue
View file @ 6bc360dc
......@@ -20,7 +20,7 @@
<a-row :gutter="16">
<a-col :span="12">
<a-form-model-item label="姓名" prop="womanName">
<a-input v-toInputNum="{num: 15}" @keyup.enter.native="nextFocus(1)" ref="input1"
<a-input v-toInputNum="{num: 15}" @keyup.enter.native="nextFocus(1)" ref="input1"
placeholder="请输入姓名，最多可输入15个字"
:disabled="disabled"
v-model="formData.womanName"></a-input>
......@@ -28,7 +28,8 @@
</a-col>
<a-col :span="12">
<a-form-model-item label="证件类型" prop="womenCertificateType">
<a-select v-model="formData.womenCertificateType" placeholder="请选择" @keyup.enter.native="nextFocus(2)" ref="input2"
<a-select v-model="formData.womenCertificateType" placeholder="请选择"
@keyup.enter.native="nextFocus(2)" ref="input2"
:disabled="disabled" @change="changeWomenCardType">
<a-select-option v-for="item in certificateTypeList"
:key="item.enumValue" :value="item.enumValue"
......@@ -41,7 +42,8 @@
<a-col :span="12" v-if="formData.womenCertificateType!=3">
<a-form-model-item label="证件号码" prop="womenIdCard">
<a-input placeholder="请输入证件号码" @blur="womenIdCardChange" style="width: 100%" @keyup.enter.native="nextFocus(3)" ref="input3"
<a-input placeholder="请输入证件号码" @blur="womenIdCardChange" style="width: 100%"
@keyup.enter.native="nextFocus(3)" ref="input3"
v-model="formData.womenIdCard"
:disabled="disabled"></a-input>
</a-form-model-item>
......@@ -91,7 +93,7 @@
</div>
<a-row :gutter="16" style="margin-left: 150px">
<a-col :span="12">
<span style="font-weight: bold">符合以下情况的，请在□里打√：</span>
<span style="font-weight: bold">符合以下情况的，请在□里打√：</span>
<a-form-model-item label="" prop="checkedList">
<a-checkbox-group style="width: 100%" v-model="checkedList" :options="plainOptions"
@change="onChange"/>
......@@ -111,14 +113,16 @@
<a-col :span="24">
<a-form-model-item label="联系电话" prop="telephone" :labelCol="{span: 3}"
:wrapperCol="{span: 8}">
<a-input placeholder="请输入联系电话" v-model="formData.telephone" @keyup.enter.native="nextFocus(7)" ref="input7"
<a-input placeholder="请输入联系电话" v-model="formData.telephone"
@keyup.enter.native="nextFocus(7)" ref="input7"
:disabled="disabled"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="现住地址" prop="presentCode" :labelCol="{span: 3}"
:wrapperCol="{span: 20}">
<all-area-cascader :disabled="disabled" @keyup.enter.native="nextFocus(8)" ref="input8"
<all-area-cascader :disabled="disabled" @keyup.enter.native="nextFocus(8)"
ref="input8"
v-model="formData.presentCode"></all-area-cascader>
</a-form-model-item>
</a-col>
......@@ -257,7 +261,7 @@ export default {
weight: null,
height: null,
bmi: "",
womanName: undefined,
womanName: "",
womenCertificateType: '1',
womenIdCard: undefined,
oncePregnant: '',
......@@ -282,7 +286,7 @@ export default {
disabled: false,
formRules: {
womanName: [
{required: true, message: '请输入姓名'}
{required: true, message: '请输入姓名',trigger: 'change'}
],
womenCertificateType: [
{required: true, message: '请选择证件类型'}
......@@ -477,7 +481,7 @@ export default {
signedMode: data.signedMode ? data.signedMode.toString() : "1",
applySignUrl: data.applySignUrl,
parentDate: data.parentDate,
provideDate: moment(new Date()).format('yyyy-MM-DD'),
provideDate: data.provideDate || moment(new Date()).format('yyyy-MM-DD'),
remarks: data.remarks,
provideDoctorId: this.userInfo.relationId,
recommendEat: data.recommendEat,
......@@ -518,7 +522,7 @@ export default {
signedMode: data.signedMode ? data.signedMode.toString() : "1",
applySignUrl: data.applySignUrl,
parentDate: data.parentDate,
provideDate: moment(new Date()).format('yyyy-MM-DD'),
provideDate: data.provideDate || moment(new Date()).format('yyyy-MM-DD'),
provideDoctorId: this.userInfo.relationId,
provideRecordList: data.provideRecordList,
remarks: data.remarks,
......@@ -636,6 +640,8 @@ export default {
questionList += x + ",";
})
this.formData.question = questionList.substring(0, questionList.length - 1);
} else {
this.formData.question = "";
}
this.spinning = true;
let params = {};
......@@ -767,20 +773,20 @@ export default {
<style scoped lang="less">
.title_img {
display: inline-block;
width: 24px;
height: 24px;
margin-top: -5px;
margin-left: 10px;
display: inline-block;
width: 24px;
height: 24px;
margin-top: -5px;
margin-left: 10px;
}
.title_font {
font-family: PingFang SC;
color: #595959;
font-weight: 600;
font-size: 16px;
line-height: 22px;
margin: 16px 0px 16px 18px;
font-family: PingFang SC;
color: #595959;
font-weight: 600;
font-size: 16px;
line-height: 22px;
margin: 16px 0px 16px 18px;
}
</style>
......@@ -788,44 +794,44 @@ export default {
<style lang="less">
.book {
.ant-card-head-title {
padding: 0px !important;
}
.ant-card-head-title {
padding: 0px !important;
}
}
.sign {
position: absolute;
background: #FFF1F0;
border-radius: 0px 0px 24px 0px;
width: 60px;
height: 40px;
padding: 0px 16px;
position: absolute;
background: #FFF1F0;
border-radius: 0px 0px 24px 0px;
width: 60px;
height: 40px;
padding: 0px 16px;
}
.opt {
float: right;
margin-top: 10px;
float: right;
margin-top: 10px;
}
.table_input {
.ant-table-tbody > tr > td {
padding: 5px !important;
overflow-wrap: break-word;
}
.ant-table-tbody > tr > td {
padding: 5px !important;
overflow-wrap: break-word;
}
}
.modal_table {
.ant-form-item {
margin-bottom: 0px !important;
}
.ant-form-item {
margin-bottom: 0px !important;
}
}
.ant-checkbox-group-item {
display: block;
margin-top: 20px;
display: block;
margin-top: 20px;
}
.ant-checkbox-group {
width: 100%;
width: 100%;
}
</style>
folacin-pc/src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue
View file @ 6bc360dc
......@@ -175,6 +175,8 @@ export default {
this.checkedList.push(this.plainOptions["key"+x]);
})
}
}).catch(res=>{
this.spinning = false;
})
},
goBack() {
......
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