Skip to content

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

测试BU修改

parent 57789e22
Expand all Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 69 deletions
.env.test
View file @ aa899207
NODE_ENV = test
VUE_APP_BASE_URL = http://123.56.183.13:8083
VUE_APP_BASE_URL1 = http://123.56.183.13:8083
VUE_APP_BASE_URL = https://beta-ysservice.yiboshi.com
VUE_APP_LOCATION = https://beta-yesuan.yiboshi.com/#/
VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'
package.json
View file @ aa899207
......@@ -10,7 +10,7 @@
"build:yueyang": "vue-cli-service build --mode yueyang"
},
"dependencies": {
"ant-design-vue": "^1.6.4",
"ant-design-vue": "^1.7.8",
"axios": "^0.19.2",
"compression-webpack-plugin": "5.0.0",
"core-js": "^3.6.5",
......
src/api/index.js
View file @ aa899207
......@@ -53,6 +53,9 @@ export default {
fetchConsentInfo(params) {//查询单位的知情同意书
return fetch(`/v1/folacin-admin/folacin-consent-info/consent`, params)
},
fetchConsentInfoShow(params) {//查询单位的知情同意书
return fetch(`/v1/folacin-admin/folacin-consent-info/consent-info`, params)
},
fetchAddConsentInfo(params) {//新增单位的知情同意书
return fetch(`/v1/folacin-admin/folacin-consent-info`, params, "post", "json")
},
......
src/main.js
View file @ aa899207
......@@ -13,7 +13,7 @@ import 'ant-design-vue/dist/antd.less'
// import 'nprogress/nprogress.css'
import './antd/register'
import api from './api'
import {optionalChaining} from "./views/utils/common";
// import {optionalChaining} from "./views/utils/common";
import Moment from 'moment';
import './views/utils/directives/debounce'
import './views/utils/directives/throttle'
......@@ -25,7 +25,7 @@ import {message, modal} from 'ant-design-vue'
const {confirm} = modal
Vue.prototype.$api = api;
Vue.prototype.$isNot = optionalChaining; // 非空判断，为空返回 "未知"
// Vue.prototype.$isNot = optionalChaining; // 非空判断，为空返回 "未知"
Vue.prototype.$message= message
Vue.prototype.$confirm= confirm
Vue.filter('formatDate', function(value) {// 定义全局时间戳过滤器
......
src/views/Login.vue
View file @ aa899207
......@@ -11,11 +11,6 @@
<a-input placeholder="请输入用户名" v-model="formData.username" size="large" @keyup.enter="login">
<a-icon slot="prefix" type="user"/>
</a-input>
<!-- <a-select v-model="formData.username" size="large" @change="userChange">-->
<!-- <a-select-option v-for="(i,index) in userList" :key="i.userName" :value="index">-->
<!-- {{ i.unitName + "(" + i.userName + ")" }}-->
<!-- </a-select-option>-->
<!-- </a-select>-->
</a-form-model-item>
<a-form-model-item prop="password">
<a-input-password placeholder="请输入密码" v-model="formData.password" size="large"
......@@ -60,7 +55,9 @@ export default {
data() {
return {
userList: [],
formData: {},
formData: {
password:"YNybs2021?"
},
formRules: {},
captchaVerificationVis: true,
captchaVerification: {},
......@@ -70,9 +67,6 @@ export default {
created() {
},
methods: {
userChange(value) {
this.formData.password = "YNybs2021?";
},
login() {
this.loading = true;
let fromData = new FormData();
......
src/views/indexComponent/InformedConsent/InformedConsent.vue
View file @ aa899207
......@@ -89,20 +89,11 @@
title: '确定提交吗？',
okType: 'success',
onOk: () => {
if (this.modeType === "add") {
vm.$api.common.fetchAddConsentInfo(this.formData).then(res => {
if (res.code === 'SUCCESS') {
vm.$message.success('操作成功！')
}
})
} else {
vm.$api.common.fetchUpdateConsentInfo(this.formData).then(res => {
if (res.code === 'SUCCESS') {
vm.$message.success('操作成功！')
}
})
}
},
onCancel: () => {
},
......
src/views/indexComponent/folviteApply/folviteApply.vue
View file @ aa899207
......@@ -5,7 +5,7 @@
<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">
{{item.enumName}}
{{ item.enumName }}
</a-select-option>
</a-select>
</a-form-item>
......@@ -18,7 +18,9 @@
<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 ant-table-btn" icon="sync" 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>
</a-form>
......@@ -31,11 +33,14 @@
:scroll="{ x: 1}"
>
<template slot="expireDateS" slot-scope="record">
{{record.expireDate | formatDate}}
{{ record.expireDate | formatDate }}
</template>
<template slot="action" slot-scope="record">
<a-button class="ant-table-btn" size="small" @click="toDetail(record)" :disabled="record.status===2">发放</a-button>
<a-button style="margin-left: 5px" class="ant-table-btn" size="small" @click="deleteConfirm(record)" :disabled="record.status===2">删除
<a-button class="ant-table-btn" size="small" @click="toDetail(record)" :disabled="record.status===2">
发放
</a-button>
<a-button style="margin-left: 5px" class="ant-table-btn" size="small" @click="deleteConfirm(record)"
:disabled="record.status===2">删除
</a-button>
</template>
</a-table>
......@@ -54,19 +59,19 @@
</div>
</template>
<script>
import {getEnumByFlag, isEmptyParams} from "../../utils/common";
import moment from 'moment'
import {getEnumByFlag, isEmptyParams} from "../../utils/common";
import moment from 'moment'
const columns = [
const columns = [
{
title: '女方姓名',
dataIndex: 'womanName',
width:"140px"
width: "140px"
},
{
title: '证件类型',
dataIndex: 'womenCertificateTypeName',
width:'140px'
width: '140px'
},
{
title: '证件号码',
......@@ -101,7 +106,7 @@
{
title: '领取日期',
dataIndex: 'provideDate',
width:'120px'
width: '120px'
},
{
title: '操作',
......@@ -110,8 +115,8 @@
width: 140,
scopedSlots: {customRender: 'action'},
},
]
export default {
]
export default {
components: {},
data() {
return {
......@@ -134,7 +139,7 @@
}
},
created() {
this.routerParams = this.$route.query
this.routerParams = this.$route.query;
if (this.routerParams.menuId) {
window.sessionStorage.setItem('menuId', this.routerParams.menuId)
this.menuId = this.routerParams.menuId
......@@ -226,35 +231,39 @@
});
},
toDetail(record) {
let now_location = escape(process.env.VUE_APP_LOCATION+`folviteDistribution/add?menuId=${this.menuId}&menuCode=${this.routerParams.menuName}&routerFlag=update`)
window.top.postMessage({messageType:'THIRD_PAGEADD',title:`叶酸申请`,url:now_location}, '*')
// let params = {
// id: record.id,
// routerFlag: 'update',
// menuId: this.menuId
// }
// this.$router.push({path: '/folviteDistribution/add', query: params})
if (process.env.NODE_ENV == "dev") {
let params = {
id: record.id,
routerFlag: 'update',
menuId: this.menuId
}
},
this.$router.push({path: '/folviteDistribution/add', query: params})
} else {
let now_location = escape(process.env.VUE_APP_LOCATION + `folviteDistribution/add?menuId=${this.menuId}&menuCode=${this.routerParams.menuName}&routerFlag=update&id=` + record.id)
window.top.postMessage({messageType: 'THIRD_PAGEADD', title: `叶酸申请`, url: now_location}, '*')
}
}
},
}
</script>
<style lang="less" scoped>
// 文件上传样式
.ant-upload-select-picture-card i {
// 文件上传样式
.ant-upload-select-picture-card i {
font-size: 32px;
color: #999;
}
}
.ant-upload-select-picture-card .ant-upload-text {
.ant-upload-select-picture-card .ant-upload-text {
margin-top: 6px;
color: #666;
}
}
.btn_space {
.btn_space {
margin-right: 5px;
}
}
/* .search_form {
/* .search_form {
margin-top: -17px;
border: 1px solid rgba(255,77,128, .2);
border-top: 0px;
......
src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue
View file @ aa899207
......@@ -37,10 +37,10 @@
<!-- {{detailInfo.pregnantNum || '&#45;&#45;'}}-->
<!-- </a-descriptions-item>-->
<a-descriptions-item label="身高">
{{detailInfo.height || '--'}}
{{detailInfo.height?detailInfo.height+"cm":'--'}}
</a-descriptions-item>
<a-descriptions-item label="体重">
{{detailInfo.weight || '--'}}
{{detailInfo.weight?detailInfo.weight+"kg":'--'}}
</a-descriptions-item>
</a-descriptions>
<!-- <div class="detail_title" style="border-top: 0px">-->
......@@ -73,6 +73,7 @@
<a-descriptions-item label="现在住址">
{{detailInfo.presentCodeName || '--'}}
</a-descriptions-item>
<a-descriptions-item label="详细地址">
{{detailInfo.nowAddress || '--'}}
</a-descriptions-item>
......@@ -86,6 +87,9 @@
<img style="cursor: pointer" width="120px" height="120px" :src="detailInfo.consentUrl"
@click="showVisible=true"/>
</a-descriptions-item>
<a-descriptions-item label="签名" v-if="routerParams.source == 2">
<img style="width: auto;height: 80px" :src="detailInfo.applySignUrl">
</a-descriptions-item>
</a-descriptions>
<!-- <div class="card_info">
<a-card class="book" :headStyle="{background: '#FAFAFA'}" v-if="routerParams.source == 2">
......@@ -98,9 +102,6 @@
</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-item label="上传照片">-->
<!-- {{detailInfo.batchNumber || '&#45;&#45;'}}-->
......@@ -112,8 +113,8 @@
<div class="divider_my"><span class="midText">发放信息</span></div>
</div>
<div style="clear: both"></div>
<a-descriptions bordered :column="2" class="folvite_title">
<a-descriptions-item label="发放日期">
<a-descriptions bordered :column="3" class="folvite_title">
<a-descriptions-item label="发放日期" >
{{detailInfo.provideDate || '--'}}
</a-descriptions-item>
<a-descriptions-item label="发放医生">
......
src/views/utils/common.js
View file @ aa899207
......@@ -119,20 +119,20 @@ export const timeFormat = (time, format = 'YYYY-MM-DD') => {
let b = this.$isNot(ces, 'data', 'data1', 'name') //测试
{{$isNot(ces, 'data', 'data1', 'name')}} //测试
*/
export const optionalChaining = (obj, ...rest) => {
let tmp = obj;
for (let key in rest) {
let name = rest[key];
tmp = tmp?.[name]; //es11可选链
}
return tmp ?? "未知";
};
// export const optionalChaining = (obj, ...rest) => {
// let tmp = obj;
// for (let key in rest) {
// let name = rest[key];
// tmp = tmp?.[name]; //es11可选链
// }
// return tmp ?? "未知";
// };
// 校验手机号
export const checkPhone = (rule, value, callback) => {
if (value == '' || value == undefined) {
callback()
callback();
}
let ckPhone = /^1(?:3[0-9]|4[5-9]|5[0-9]|6[12456]|7[0-8]|8[0-9]|9[0-9])[0-9]{8}$/;
let tell = /^0\d{2,3}-?\d{7,8}$/;
......
yarn.lock
View file @ aa899207
This diff is collapsed.
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