Skip to content

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

bug完善

parent caed2e8c
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 40 deletions
src/views/Home.vue
View file @ fbd12a95
......@@ -64,7 +64,8 @@
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
// window.sessionStorage.setItem('menuList', JSON.stringify(data.menuList));
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList));
window.sessionStorage.setItem('unitInfo', JSON.stringify(data.unitInfo));
this.setInitMenuInfo()
this.showChildren = true
})
......
src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue
View file @ fbd12a95
......@@ -17,16 +17,16 @@
<img class="title_img" src="../../../../../static/images/user_info_index.png">
<span class="title_font">女方信息</span>
</div>
<a-button slot="extra">身份证识别</a-button>
<a-button slot="extra" class="ant-table-btn">身份证识别</a-button>
<a-row :gutter="16">
<a-col :span="12">
<a-form-model-item label="姓名" prop="womanName">
<a-input placeholder="请输入姓名" v-model="formData.womanName"></a-input>
<a-input placeholder="请输入姓名" :disabled="disabled" v-model="formData.womanName"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="证件类型" prop="womenCertificateType">
<a-select v-model="formData.womenCertificateType" placeholder="请选择">
<a-select v-model="formData.womenCertificateType" placeholder="请选择" :disabled="disabled">
<a-select-option v-for="item in certificateTypeList"
:key="item.enumValue" :value="item.enumValue"
>
......@@ -38,12 +38,12 @@
<a-col :span="12">
<a-form-model-item label="证件号码" prop="womenIdCard">
<a-input placeholder="请输入证件号码" v-model="formData.womenIdCard"></a-input>
<a-input placeholder="请输入证件号码" v-model="formData.womenIdCard" :disabled="disabled"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="是否曾经怀孕" prop="oncePregnant">
<a-radio-group v-model="formData.oncePregnant" @change="onChangePregnant">
<a-radio-group v-model="formData.oncePregnant" @change="onChangePregnant" :disabled="disabled">
<a-radio :value="1">
是
</a-radio>
......@@ -55,7 +55,7 @@
</a-col>
<a-col :span="12">
<a-form-model-item label="孕次" prop="pregnantNum" v-if="formData.oncePregnant==1">
<a-input v-toInt placeholder="请输入" v-model="formData.pregnantNum"></a-input>
<a-input v-toInt placeholder="请输入" v-model="formData.pregnantNum" :disabled="disabled"></a-input>
</a-form-model-item>
</a-col>
</a-row>
......@@ -65,16 +65,16 @@
<img class="title_img" src="../../../../../static/images/user_info_index.png">
<span class="title_font">男方信息</span>
</div>
<a-button slot="extra">身份证识别</a-button>
<a-button slot="extra" class="ant-table-btn">身份证识别</a-button>
<a-row :gutter="16">
<a-col :span="12">
<a-form-model-item label="姓名" prop="manName">
<a-input placeholder="请输入姓名" v-model="formData.manName"></a-input>
<a-input placeholder="请输入姓名" v-model="formData.manName" :disabled="disabled"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="证件类型" prop="menCertificateType">
<a-select v-model="formData.menCertificateType" placeholder="请选择">
<a-select v-model="formData.menCertificateType" placeholder="请选择" :disabled="disabled">
<a-select-option v-for="item in certificateTypeList"
:key="item.enumValue" :value="item.enumValue"
>
......@@ -86,7 +86,7 @@
<a-col :span="12">
<a-form-model-item label="证件号码" prop="menIdCard">
<a-input placeholder="请输入证件号码" v-model="formData.menIdCard"></a-input>
<a-input placeholder="请输入证件号码" v-model="formData.menIdCard" :disabled="disabled"></a-input>
</a-form-model-item>
</a-col>
</a-row>
......@@ -100,7 +100,7 @@
<a-col :span="24">
<a-form-model-item label="联系电话" prop="telephone" :labelCol="{span: 3}"
:wrapperCol="{span: 8}">
<a-input placeholder="请输入联系电话" v-model="formData.telephone"></a-input>
<a-input placeholder="请输入联系电话" v-model="formData.telephone" :disabled="disabled"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
......@@ -109,6 +109,7 @@
<!--<a-input placeholder="请输入现住地址" v-model="formData.presentCode"></a-input>-->
<a-cascader v-model="formData.presentCode"
change-on-select
:disabled="disabled"
:options="areaInfo"
:fieldNames="fieldNames"
:load-data="loadAreaData"
......@@ -120,7 +121,7 @@
<a-col :span="24">
<a-form-model-item label="详细地址" prop="nowAddress" :labelCol="{span: 3}"
:wrapperCol="{span: 20}">
<a-input placeholder="请输入详细地址" v-model="formData.nowAddress"></a-input>
<a-input placeholder="请输入详细地址" v-model="formData.nowAddress" :disabled="disabled"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
......@@ -136,7 +137,7 @@
</a-col>
<a-col :span="12">
<a-form-model-item label="签署日期" prop="parentDate">
<a-date-picker v-model="formData.parentDate" format="YYYY-MM-DD"
<a-date-picker v-model="formData.parentDate" format="YYYY-MM-DD" :disabled="disabled"
style="width: 100%"/>
</a-form-model-item>
</a-col>
......@@ -179,7 +180,6 @@
<div class="divider_my"><span class="midText">发放信息</span></div>
</div>
<div style="clear: both"></div>
<a-col :span="12">
<a-form-model-item label="发放日期" prop="provideDate">
<a-date-picker v-model="formData.provideDate" format="YYYY-MM-DD" style="width: 100%"/>
......@@ -198,7 +198,7 @@
</a-col>
<a-col :span="21" :offset="3">
<a-form-model-item :wrapperCol="{span: 23}">
<a-button type="primary" @click="openStockModel" style="margin-bottom: 10px">请选择要发放的叶酸种类
<a-button type="primary" @click="openStockModel">请选择要发放的叶酸种类
</a-button>
<a-table :dataSource="formData.provideRecordList" rowKey="id" :pagination="false"
class="table_input tab_error"
......@@ -291,11 +291,12 @@
nowAddress: undefined,
signedMode: '2',
parentDate: undefined,
provideDate: undefined,
provideDate: moment(new Date()).format('yyyy-MM-DD'),
provideDoctorId: undefined,
provideRecordList: [],
remarks: undefined,
},
disabled:false,
formRules: {
womanName: [
{required: true, message: '请输入姓名'}
......@@ -346,11 +347,17 @@
sendNumber: [
{required: true, message: '请输入发放数量'},
{
validator: (rule, value, callback) => {
validator: (rule, value, callback, prod) => {
let index;
for (let key in prod) {
let keyArr = key.split(".");
index = Number(keyArr[1]);
}
if (value == '' || value == undefined) {
callback()
}
if (value <= recordInfo.number) {
let number = this.formData.provideRecordList[index].number
if (value <= number) {
callback()
} else {
callback(new Error('超出当前库存！'));
......@@ -381,12 +388,13 @@
}
},
created() {
this.routerParams = this.$route.query
this.routerParams = this.$route.query;
this.certificateTypeList = getEnumByFlag('folacin_resident_info_certificate_type')
this.signedModeList = getEnumByFlag('folacin_resident_info_signed_mode')
this.getBookHtmlContent()
this.getAllDoctorList()
if (this.routerParams.routerFlag == 'update') {//从申请过来的发放
this.disabled=true;
this.getStockListDetail()
} else {//由新增过来的发放
this.initLoadAreaData()
......
src/views/indexComponent/folviteDistribution/folviteDistribution.vue
View file @ fbd12a95
......@@ -30,9 +30,13 @@
</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 type="link" v-if="record.source===1&&record.isSigned===2" size="small"
@click="uploadConsentInfo(record)">上传线下同意书
<a-button class="ant-table-btn" size="small" @click="toDetail(record)">查看</a-button>
<a-button class="ant-table-btn" v-if="record.source===1&&record.isSigned===2" size="small"
style="margin-left: 10px"
@click="uploadConsentInfo(record)">签署知情同意书
</a-button>
<a-button class="ant-table-btn" v-else size="small" style="margin-left: 10px"
@click="showConsentInfo(record)">已签知情同意书
</a-button>
</template>
</a-table>
......@@ -66,8 +70,25 @@
<br>
</div>
</a-modal>
<a-modal :visible="previewVisible" :footer="null" @cancel="previewVisible=false">
<img alt="example" style="width: 100%" :src="imageUrl"/>
<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 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>
</div>
</div>
</a-modal>
<a-pagination
v-if="pagination.total > 0"
......@@ -130,9 +151,9 @@
},
{
title: '操作',
fixed:'right',
fixed: 'right',
align: 'left',
width: "200px",
width: "240px",
scopedSlots: {customRender: 'action'},
},
]
......@@ -140,7 +161,6 @@
components: {},
data() {
return {
// 搜索框对象
searchForm: {
womenIdCard: undefined
......@@ -155,8 +175,11 @@
tableData: [],
loading: false,
visible: false,
showVisible: false,
previewVisible: false,
imageUrl: "",
consentUrl: "",
applySignUrl:"",
consentInfo: "",
headers: {
Authorization: sessionStorage.getItem("token")
},
......@@ -165,7 +188,8 @@
formData: {
consentId: "",
id: ""
}
},
currentRow: {},
}
},
created() {
......@@ -224,20 +248,35 @@
this.formData.id = row.id;
this.visible = true;
},
showConsentInfo(row) {
this.currentRow = row;
this.showVisible = true;
this.$api.folviteDistributionManage.fetchFolviteDistributionDetail({residentId: row.id}).then(({data = [], code}) => {
this.consentUrl = data.consentUrl;
this.applySignUrl = data.applySignUrl;
})
if (row.source == 2) {
this.$api.common.fetchConsentInfo().then(({data}) => {
if (this.$api.utils.isNoBlank(data)) {
this.consentInfo = data.content;
}
})
}
},
handleChange(info) {
let fileList = [...info.fileList];
fileList = fileList.slice(-1);
fileList = fileList.map(file => {
if (file.response) {
this.imageUrl = file.response.data.trueDownloadUrl;
this.consentUrl = file.response.data.trueDownloadUrl;
this.formData.consentId = file.response.data.id;
}
return file;
});
this.fileList = fileList;
},
preview(val){
window.open(val.response.data.trueDownloadUrl)
preview(val) {
window.open(val.response.data.trueDownloadUrl)
},
onsubmit() {
if (this.$api.utils.isBlank(this.formData.consentId)) {
......
src/views/indexComponent/inStockManage/components/addMaterialDistribution.vue
View file @ fbd12a95
......@@ -127,7 +127,7 @@
sendUnitId: undefined,
sendUnitName: undefined,
receiveUnitId: undefined,
sendDate: undefined,
sendDate: moment(new Date()).format('yyyy-MM-DD'),
sendContact: undefined,
sendPhone: undefined,
receivePhone: undefined,
......
src/views/indexComponent/inStockManage/inStockManage.vue
View file @ fbd12a95
......@@ -65,8 +65,10 @@
</a-popover>
</div>
<div style="margin-top: 16px;margin-bottom: 10px">
<a-button type="primary" class="search_btn btn_space" @click="openModal">库存录入</a-button>
<a-button type="primary" class="search_btn btn_space " @click="openModal" v-if="unitInfo.level==3">库存录入
</a-button>
<a-button type="primary" class="search_btn btn_space" :disabled="selectedRowKeys.length <= 0"
v-if="unitInfo.level==3||unitInfo.level==4"
@click="toAdd">调拨分配
</a-button>
<a-button type="primary" class="search_btn btn_space">导出Excel</a-button>
......@@ -159,7 +161,7 @@
},
{
title: '操作',
fixed:"right",
fixed: "right",
align: 'center',
scopedSlots: {customRender: 'action'},
},
......@@ -189,7 +191,8 @@
selectedRowKeys: [],
selectedVisible: false,
selectedRowList: [],
routerParams: {}
routerParams: {},
unitInfo: JSON.parse(sessionStorage.getItem("unitInfo"))
}
},
created() {
......@@ -304,7 +307,7 @@
this.$router.push({path: '/inStock/addMaterialDistribution', query: {selected: this.selectedRowKeys}})
},
toDetail(record) {
this.$router.push({path: '/inStock/inStockManageDetail', query: {id:record.id}})
this.$router.push({path: '/inStock/inStockManageDetail', query: {id: record.id}})
}
},
}
......
src/views/indexComponent/supplyManage/components/addSupply.vue
View file @ fbd12a95
......@@ -61,9 +61,10 @@
:labelCol="{span: 3}"
:wrapperCol="{span: 20}">
<a-textarea
placeholder="请输入备注，100字以内"
:rows="6"
v-model="formData.remarks"
placeholder="请输入备注"></a-textarea>
:maxLength="100"
v-model="formData.remarks"></a-textarea>
</a-form-model-item>
</a-col>
</a-row>
......
static/css/global.less
View file @ fbd12a95
......@@ -296,4 +296,9 @@ ant-pagination-item:focus, .ant-pagination-item:hover {
line-height: 24px;
transform: translateX(-50%) translateY(-50%);
}
.ant-table-btn{
color: #FF4D80;
border: 1px solid #FF4D80;
}
//---------------------------------------------------------
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