Skip to content

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

需求更新

parent db422725
Hide whitespace changes
Inline Side-by-side
Showing with 333 additions and 394 deletions
.env.dev
View file @ fafa6b6f
NODE_ENV = dev
VUE_APP_BASE_URL = https://beta-ysservice.yiboshi.com
VUE_APP_BASE_URL111 = https://beta-ysservice.yiboshi.com
VUE_APP_BASE_URL1 = https://ys-service.yiboshi.com
VUE_APP_BASE_URL111 = http://59.230.237.90:8115
VUE_APP_BASE_URL22 = http://192.168.1.103:8083
VUE_APP_BASE_URL = http://127.0.0.1:8083
VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'
......
src/api/index.js
View file @ fafa6b6f
......@@ -205,6 +205,12 @@ export default {
fetchFolviteUploadConsent(params) {//上传知情同意书
return fetch(`/v1/folacin-admin/folacin-resident-info/upload-consent/${params.id}/${params.consentId}`, {}, 'post')
},
fetchFolviteDelete(id) {//删除记录
return fetch(`/v1/folacin-admin/folacin-resident-info/${id}`,{},"delete")
},
fetchLastRecord(idCard) {//查询最近一次发放记录
return fetch(`/v1/folacin-admin/folacin-resident-info/resident/${idCard}`)
},
},
//物资调拨管理
allocationManagement: {
......
src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue
View file @ fafa6b6f
......@@ -7,7 +7,6 @@
</div>
<a-form-model ref="formRef" :model="formData" :rules="formRules" :labelCol="{span: 6}"
:wrapperCol="{span: 16}">
<div style="margin: 30px 0px">
<div class="divider_my"><span class="midText">居民信息</span></div>
</div>
......@@ -42,7 +41,7 @@
<a-col :span="12" v-if="formData.womenCertificateType!=3">
<a-form-model-item label="证件号码" prop="womenIdCard">
<a-input placeholder="请输入证件号码" @blur="womenIdCardChange"
<a-input placeholder="请输入证件号码" @blur="womenIdCardChange" style="width: 100%"
v-model="formData.womenIdCard"
:disabled="disabled"></a-input>
</a-form-model-item>
......@@ -121,7 +120,9 @@
:options="areaInfo"
:fieldNames="fieldNames"
:load-data="loadAreaData"
:placeholder="unitInfo.areaFullName"/>
placeholder="请选择">
</a-cascader>
<span>{{ formData.presentCodeStr }}</span>
</a-form-model-item>
</a-col>
......@@ -154,26 +155,6 @@
style="width: 100%"/>
</a-form-model-item>
</a-col>
<!--<a-col :span="21" :offset="3" v-if="routerParams.routerFlag == 'update'">
<a-form-model-item :wrapperCol="{span: 23}">
<a-card class="book" :headStyle="{background: '#FAFAFA'}">
<div slot="title" style="text-align: center;padding: 10px 0px">
<span style="color: #262626;font-size: 14px">知情同意书</span>
</div>
<div>
<div v-html="bookHtmlContent.content">
</div>
</div>
</a-card>
</a-form-model-item>
</a-col>-->
<!-- <a-col :span="21" :offset="3" v-if="routerParams.routerFlag == 'update'">
<a-form-model-item :wrapperCol="{span: 23}">
<div style="border: 1px dashed #EEEEEE;width: 100%">
<img style="height: 140px;" :src="formData.applySignUrl">
</div>
</a-form-model-item>
</a-col>-->
<a-col :span="12" :offset="3" v-if="this.routerParams.routerFlag == 'update'">
<a-form-model-item :wrapperCol="{span: 16}">
<div style="border: 1px dashed #EEEEEE;text-align: center">
......@@ -183,91 +164,41 @@
</div>
</a-form-model-item>
</a-col>
<!-- <a-col :span="21" :offset="3">
<a-form-model-item :wrapperCol="{span: 23}">
<div style="border: 1px dashed #EEEEEE">
<div class="sign">签字</div>
<vue-signature-pad
id="signature"
width="100%"
height="200px"
ref="signaturePad"
:options="options"
/>
<div class="opt">
<a-button @click="reWrite">重写</a-button>
<a-button type="primary" @click="save" style="margin-left: 10px">确定签字</a-button>
</div>
</div>
</a-form-model-item>
</a-col>-->
</a-row>
</a-card>
<div style="margin: 30px 0px">
<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" value-format="yyyy-MM-DD" format="YYYY-MM-DD"
style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="发放医生" prop="provideDoctorId">
<a-select v-model="formData.provideDoctorId" placeholder="请选择">
<a-select-option v-for="item in doctorInfoList"
:key="item.id" :value="item.id"
>
{{ item.staffName }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<!-- <a-col :span="21" :offset="3">-->
<!-- <a-form-model-item :wrapperCol="{span: 23}">-->
<!-- <a-button type="primary" @click="openStockModel">请选择要发放的叶酸种类-->
<!-- </a-button>-->
<!-- <a-table :dataSource="formData.provideRecordList" rowKey="id" :pagination="false"-->
<!-- class="table_input tab_error modal_table"-->
<!-- style="margin-top: 10px"-->
<!-- bordered>-->
<!-- <a-table-column title="供应商名称" data-index="supplierName"></a-table-column>-->
<!-- <a-table-column title="品牌" data-index="brandName"></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">-->
<!-- <template slot-scope="text, record, index">-->
<!-- <a-form-model-item :prop="'provideRecordList.' + index + '.sendNumber'"-->
<!-- :rules="formRules.sendNumber" class="tab_input_r">-->
<!-- <a-input type="number"-->
<!-- v-toInt="{notNum: '0'}"-->
<!-- v-model="record.sendNumber"-->
<!-- placeholder="请输入发放数量"-->
<!-- style="width: 150px;"-->
<!-- @change="getChangeRecord(record)"-->
<!-- >-->
<!-- </a-input>-->
<!-- </a-form-model-item>-->
<!-- </template>-->
<!-- </a-table-column>-->
<!-- <a-table-column title="操作" align="center" width="70px">-->
<!-- <template slot-scope="text, record, index">-->
<!-- &lt;!&ndash; <a-button type="link" class="table_delbtn" @click="deleteGoodsList(index)">删除</a-button> &ndash;&gt;-->
<!-- <a-popconfirm-->
<!-- title="确定移除该物资吗？"-->
<!-- ok-text="是"-->
<!-- cancel-text="否"-->
<!-- @confirm="confirm(index)"-->
<!-- >-->
<!-- <a-button class="ant-table-btn" size="small">删除</a-button>-->
<!-- </a-popconfirm>-->
<!-- </template>-->
<!-- </a-table-column>-->
<!-- </a-table>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-row>
<a-col :span="12">
<a-form-model-item label="发放日期" prop="provideDate">
<a-date-picker v-model="formData.provideDate" value-format="yyyy-MM-DD"
format="YYYY-MM-DD"
style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="发放数量" prop="provideNumber">
<a-input type="number" placeholder="请输入发放数量"
v-model="formData.provideNumber" :max="10" suffix="瓶"
></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="12">
<a-form-model-item label="发放医生" prop="provideDoctorId">
<a-select v-model="formData.provideDoctorId" placeholder="请选择">
<a-select-option v-for="item in doctorInfoList"
:key="item.id" :value="item.id"
>
{{ item.staffName }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
</a-row>
<a-col :span="24">
<a-form-model-item label="备注" prop="remarks" :labelCol="{span: 3}" :wrapperCol="{span: 20}">
<a-textarea placeholder="请输入备注，最多可输入500字" v-model="formData.remarks" :rows="5"
......@@ -283,7 +214,8 @@
</div>
<div style="text-align: center;margin-top: 16px">
<a-button class="ant-table-btn" @click="goBack">取消</a-button>
<a-button type="primary" :loading="spinning" @click="addMaterialDis" style="margin-left: 8px">发放
<a-button type="primary" :loading="spinning" @click="addMaterialDis" style="margin-left: 8px">
确认
</a-button>
</div>
</a-card>
......@@ -299,7 +231,6 @@ import moment from 'moment'
import InStockManageInfo from "./inStockManageInfo";
let vm = this
let recordInfo = {}
export default {
components: {InStockManageInfo},
data() {
......@@ -307,6 +238,7 @@ export default {
let userInfo = JSON.parse(window.sessionStorage.getItem('userInfo'));
let date = moment(new Date()).format('YYYY-MM-DD');
return {
modelType: "",
userInfo: userInfo,
unitInfo: unitInfo,
indeterminate: true,
......@@ -316,6 +248,8 @@ export default {
spinning: false,
// 弹窗内表单
formData: {
weight: null,
height: null,
bmi: "",
womanName: undefined,
womenCertificateType: '1',
......@@ -323,15 +257,16 @@ export default {
oncePregnant: '',
pregnantNum: undefined,
manName: undefined,
menCertificateType: '1',
menIdCard: undefined,
telephone: undefined,
presentCode: undefined,
presentCodeStr: unitInfo.areaFullName,
nowAddress: "",
signedMode: '2',
parentDate: date,
provideDate: date,
provideDoctorId: userInfo.relationId,
provideNumber: "",
provideRecordList: [],
remarks: undefined,
birthDate: "",
......@@ -354,6 +289,10 @@ export default {
message: '请输入正确的身份证号'
}
],
provideNumber: [
{required: true, message: '请输入发放数量'},
{validator: this.checkProvideNumber, trigger: 'blur'},
],
birthDate: [
{required: true, message: '请输入出生日期'}
],
......@@ -365,12 +304,6 @@ export default {
{required: true, message: '请输入体重,1000以内的数值'},
{validator: this.checkHeightWeight},
],
// oncePregnant: [
// {required: true, message: '请选择是否曾经怀孕'}
// ],
// pregnantNum: [
// {required: true, message: '请输入孕次'}
// ],
manName: [
{required: true, message: '请输入姓名'}
],
......@@ -388,9 +321,6 @@ export default {
{required: true, message: '请输入联系电话'},
{validator: checkPhone},
],
// presentCode: [
// {required: true, message: '请选择选择现住地址'}
// ],
nowAddress: [
{required: true, message: '请输入详细地址'}
],
......@@ -460,8 +390,11 @@ export default {
this.getBookHtmlContent()
this.getAllDoctorList()
this.initLoadAreaData()
if (this.routerParams.routerFlag == 'update') {//从申请过来的发放
this.disabled = true;
this.modelType = this.routerParams.routerFlag;
if (this.modelType == 'update' || this.modelType == 'updateRecord') {//从申请过来的发放
if (this.modelType == 'update') {
this.disabled = true;
}
this.getStockListDetail()
} else {//由新增过来的发放
this.initLoadAreaData()
......@@ -512,6 +445,13 @@ export default {
callback()
}
},
checkProvideNumber(rule, value, callback) {
if (value == null || value < 1 || value > 999) {
callback(new Error('请输入1-999的整数值'));
} else {
callback()
}
},
getStockListDetail() {
this.spinning = true;
let par = {
......@@ -519,8 +459,7 @@ export default {
menuId: this.routerParams.menuId
}
this.$api.folviteDistributionManage.fetchFolviteDistributionDetail(par).then(({data = [], code}) => {
// this.formData = {}
this.areaInfo = [{areaCode: data.presentCode, areaName: data.presentCodeName}];
// this.areaInfo = [{areaCode: data.presentCode, areaName: data.presentCodeName}];
this.formData = {
height: data.height,
weight: data.weight,
......@@ -530,9 +469,7 @@ export default {
womenIdCard: data.womenIdCard,
oncePregnant: +data.oncePregnant,
pregnantNum: data.pregnantNum,
// manName: data.manName,
// menCertificateType: data.menCertificateType.toString(),
// menIdCard: data.menIdCard,
provideNumber: data.provideNumber,
telephone: data.telephone,
presentCode: [data.presentCode],
nowAddress: data.nowAddress,
......@@ -542,12 +479,22 @@ export default {
provideDate: moment(new Date()).format('yyyy-MM-DD'),
provideDoctorId: this.userInfo.relationId,
provideRecordList: data.provideRecordList,
remarks: data.remarks
remarks: data.remarks,
recommendEat: data.recommendEat,
presentCodeStr: data.presentCodeName
}
this.formData.bmi = !this.formData.height || this.formData.height == 0 ? '-' : this.formData.weight / this.formData.height ? (this.formData.weight / ((this.formData.height / 100) * (this.formData.height / 100))).toFixed(2) : '-';
if (this.formData.bmi >= 28) {
this.formData.recommendEat = "2颗/天(0.8mg/天)";
}
if (!this.disabled) {
this.formData.recommendEat = data.recommendEat;
}
if (data.question) {
let questionList = data.question.split(",");
this.checkedList = questionList;
console.log(questionList)
}
if (this.formData.womenCertificateType == '1') {
let length = this.formData.womenIdCard.length;
if (length == 15 | length == 18) {
......@@ -564,9 +511,23 @@ export default {
this.spinning = false
})
},
getLastRecord() {
this.$api.folviteDistributionManage.fetchLastRecord(this.formData.womenIdCard).then(({data = [], code}) => {
if (data == null) {
return;
}
//this.areaInfo={areaCode: data.presentCode, areaName: data.presentCodeName};
this.formData.womanName = data.residentName;
this.formData.telephone = data.telephone;
this.formData.presentCode = data.presentCode;
this.formData.presentCodeStr = data.presentCodeStr;
this.formData.nowAddress = data.nowAddress;
}).catch(() => {
})
},
getWomenIdCardInfo() {
GetUserInfoByCardDevice().then(res => {
let {cardno, name, born, address} = res;
let {cardno, name, born} = res;
this.formData.womanName = name;
this.formData.womenCertificateType = '1';
this.formData.womenIdCard = cardno;
......@@ -576,16 +537,9 @@ export default {
this.formData.birthDate = year + "-" + moth + "-" + day;
})
},
getMenIdCardInfo() {
GetUserInfoByCardDevice().then(res => {
let {cardno, name, address} = res;
this.formData.manName = name
this.formData.menIdCard = cardno
})
},
initLoadAreaData() {
this.areaInfo = []
this.loadAreaData([{areaCode: 0}])
this.areaInfo = [];
this.loadAreaData([{areaCode: 0}]);
},
loadAreaData(selectedOptions) {
const targetOption = selectedOptions[selectedOptions.length - 1];
......@@ -628,10 +582,6 @@ export default {
this.doctorInfoList = data
})
},
//------签字-----------
reWrite() {
this.$refs.signaturePad.clearSignature();
},
save() {
const {isEmpty, data} = this.$refs.signaturePad.saveSignature();
},
......@@ -655,10 +605,6 @@ export default {
let cardInfo = this.cardType.filter(item => item.id == this.formData.menCertificateType)
this.formRules.menIdCard = cardInfo[0].rule
},
//获取改变的当前项
getChangeRecord(record) {
recordInfo = record
},
getSelectedMedical(val) {//获取被选中的药具
if (val.length > 0) {
let par = {
......@@ -669,7 +615,6 @@ export default {
this.formData.provideRecordList = data
})
}
},
addMaterialDis() {//发放
let vm = this;
......@@ -684,11 +629,14 @@ export default {
}
this.spinning = true;
let params = {};
// this.formData.provideRecordList.forEach(item => {
// item.stockId = item.id
// });
const {parentDate, provideDate, presentCode, provideDoctorId, ...others} = vm.formData
const {
parentDate,
provideNumber,
provideDate,
presentCode,
provideDoctorId,
...others
} = vm.formData
let parentTime = moment(parentDate).format('YYYY-MM-DD')
let provideTme = moment(provideDate).format('YYYY-MM-DD')
let presentCodeInfo = "";
......@@ -704,46 +652,52 @@ export default {
presentCode: presentCodeInfo,
provideDoctorId: provideDoctorInfo[0].id,
provideDoctorName: provideDoctorInfo[0].staffName,
provideNumber: provideNumber,
...others
}
params.menuId = this.routerParams.menuId;
if (this.routerParams.routerFlag == 'update') {
params.applyId = this.routerParams.id
this.$api.folviteApplyManage.addFolviteDistributionByApply(params).then(({code}) => {
this.spinning = false;
if (code === 'SUCCESS') {
this.$message.success('发放成功！');
this.goBack()
}
}).catch(() => {
this.spinning = false
})
} else {
this.$api.folviteDistributionManage.fetchAddFolviteDistribution(params).then(({code}) => {
this.spinning = false;
if (code === 'SUCCESS') {
this.$message.success('发放成功！');
this.goBack()
let msg=this.modelType=='add'?'确定提交发放吗?':'确定提交修改吗?'
this.$confirm({
title: msg,
okType: 'success',
onOk: () => {
if (vm.routerParams.routerFlag == 'update') {
params.applyId = vm.routerParams.id
this.$api.folviteApplyManage.addFolviteDistributionByApply(params).then(({code}) => {
vm.spinning = false;
if (code === 'SUCCESS') {
this.$message.success('发放成功！');
this.goBack()
}
}).catch(() => {
vm.spinning = false
})
} else {
this.$api.folviteDistributionManage.fetchAddFolviteDistribution(params).then(({code}) => {
vm.spinning = false;
if (code === 'SUCCESS') {
vm.$message.success('发放成功！');
vm.goBack()
}
}).catch(() => {
vm.spinning = false
})
}
}).catch(() => {
this.spinning = false
})
}
},
onCancel: () => {
vm.spinning = false;
},
});
}
});
},
onChangePregnant(e) {
let val = e.target.value
if (val == 2) {
this.womanPregnant = true
} else {
this.womanPregnant = false
}
},
womenIdCardChange() {
if (!this.formData.womenIdCard) {
return
}
if (this.modelType == 'add') {
this.getLastRecord();
}
let womenIdCard = this.formData.womenIdCard.trim();
this.formData.womenIdCard = womenIdCard;
if (this.formData.womenCertificateType == 1) {
......@@ -762,9 +716,8 @@ export default {
this.readyGetChecked = true
let vm = this
this.$nextTick(() => {
vm.$refs.inStockManageInfo.visible = true
vm.$refs.inStockManageInfo.visible = true;
})
},
goBack() {
// window.top.postMessage({
......
src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue
View file @ fafa6b6f
......@@ -19,47 +19,24 @@
</div>
<a-descriptions bordered class="folvite_title">
<a-descriptions-item label="姓名">
{{detailInfo.womanName || '--'}}
{{ detailInfo.womanName || '--' }}
</a-descriptions-item>
<a-descriptions-item label="证件类型">
{{detailInfo.womenCertificateTypeName || '--'}}
{{ detailInfo.womenCertificateTypeName || '--' }}
</a-descriptions-item>
<a-descriptions-item label="证件号码">
{{detailInfo.womenIdCard || '--'}}
{{ detailInfo.womenIdCard || '--' }}
</a-descriptions-item>
<a-descriptions-item label="出生日期">
{{detailInfo.birthDate || '--'}}
{{ detailInfo.birthDate || '--' }}
</a-descriptions-item>
<!-- <a-descriptions-item label="是否曾经怀孕">-->
<!-- {{detailInfo.oncePregnantName || '&#45;&#45;'}}-->
<!-- </a-descriptions-item>-->
<!-- <a-descriptions-item label="孕次">-->
<!-- {{detailInfo.pregnantNum || '&#45;&#45;'}}-->
<!-- </a-descriptions-item>-->
<a-descriptions-item label="身高">
{{detailInfo.height?detailInfo.height+"cm":'--'}}
{{ detailInfo.height ? detailInfo.height + "cm" : '--' }}
</a-descriptions-item>
<a-descriptions-item label="体重">
{{detailInfo.weight?detailInfo.weight+"kg":'--'}}
{{ detailInfo.weight ? detailInfo.weight + "kg" : '--' }}
</a-descriptions-item>
</a-descriptions>
<!-- <div class="detail_title" style="border-top: 0px">-->
<!-- <div class="divider_my_dashed">-->
<!-- <span class="midText" style="font-size: 14px;color: #FF4D80;">男方信息</span>-->
<!-- </div>-->
<!-- <div style="clear: both"></div>-->
<!-- </div>-->
<!-- <a-descriptions bordered class="folvite_title">-->
<!-- <a-descriptions-item label="姓名">-->
<!-- {{detailInfo.manName || '&#45;&#45;'}}-->
<!-- </a-descriptions-item>-->
<!-- <a-descriptions-item label="证件类型">-->
<!-- {{detailInfo.menCertificateTypeName || '&#45;&#45;'}}-->
<!-- </a-descriptions-item>-->
<!-- <a-descriptions-item label="证件号码">-->
<!-- {{detailInfo.menIdCard || '&#45;&#45;'}}-->
<!-- </a-descriptions-item>-->
<!-- </a-descriptions>-->
<div class="detail_title" style="border-top: 0px">
<div class="divider_my_dashed">
<span class="midText" style="font-size: 14px;color: #FF4D80;">其他信息</span>
......@@ -68,83 +45,63 @@
</div>
<a-descriptions bordered class="folvite_title">
<a-descriptions-item label="联系电话">
{{detailInfo.telephone || '--'}}
{{ detailInfo.telephone || '--' }}
</a-descriptions-item>
<a-descriptions-item label="现在住址">
{{detailInfo.presentCodeName || '--'}}
{{ detailInfo.presentCodeName || '--' }}
</a-descriptions-item>
<a-descriptions-item label="详细地址">
{{detailInfo.nowAddress || '--'}}
{{ detailInfo.nowAddress || '--' }}
</a-descriptions-item>
<a-descriptions-item label="签署方式" :span="routerParams.source == 2 ? 2: 1">
{{detailInfo.signedModeName || '--'}}
{{ detailInfo.signedModeName || '--' }}
</a-descriptions-item>
<a-descriptions-item label="签署日期" :span="routerParams.source == 2 ? 2: 1">
{{detailInfo.parentDate || '--'}}
{{ detailInfo.parentDate || '--' }}
</a-descriptions-item>
<a-descriptions-item label="上传照片" v-if="routerParams.source != 2">
<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="margin-left: 30px;width: auto;height: 80px;transform: rotate(-90deg)" :src="detailInfo.applySignUrl">
<img style="margin-left: 30px;width: auto;height: 80px;transform: rotate(-90deg)"
:src="detailInfo.applySignUrl">
</a-descriptions-item>
</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>-->
<!-- <a-descriptions bordered layout="vertical" class="no_border">-->
<!-- <a-descriptions-item label="上传照片">-->
<!-- {{detailInfo.batchNumber || '&#45;&#45;'}}-->
<!-- </a-descriptions-item>-->
<!-- </a-descriptions>-->
</div>
<div style="margin: 30px 0px">
<div class="divider_my"><span class="midText">问卷</span></div>
<div style="clear: both"></div>
</div>
<a-descriptions bordered class="folvite_title">
<a-descriptions-item label="结果" >
<p v-for="item in checkedList ">{{item}}</p>
</a-descriptions-item>
<a-descriptions-item label="建议服用">
{{ detailInfo.recommendEat || '--' }}
</a-descriptions-item>
</a-descriptions>
<!--发放信息-->
<div style="margin: 30px 0px">
<div class="divider_my"><span class="midText">发放信息</span></div>
<div style="clear: both"></div>
</div>
<div style="clear: both"></div>
<a-descriptions bordered :column="3" class="folvite_title">
<a-descriptions-item label="发放日期" >
{{detailInfo.provideDate || '--'}}
<a-descriptions-item label="发放日期">
{{ detailInfo.provideDate || '--' }}
</a-descriptions-item>
<a-descriptions-item label="发放医生">
{{detailInfo.provideDoctorName || '--'}}
<a-descriptions-item label="发放数量">
{{ detailInfo.provideNumber ? detailInfo.provideNumber + "瓶" : '--' }}
</a-descriptions-item>
<a-descriptions-item label="建议服用">
{{detailInfo.recommendEat || '--'}}
<a-descriptions-item label="发放医生">
{{ detailInfo.provideDoctorName || '--' }}
</a-descriptions-item>
<a-descriptions-item label="备注">
{{detailInfo.remarks || '--'}}
{{ detailInfo.remarks || '--' }}
</a-descriptions-item>
</a-descriptions>
<!-- <div class="detail_title" style="border-top: 0px">-->
<!-- <div class="divider_my_dashed">-->
<!-- <span class="midText" style="font-size: 14px;color: #FF4D80;">叶酸发放种类</span>-->
<!-- </div>-->
<!-- <div style="clear: both"></div>-->
<!-- </div>-->
<!-- <a-table :dataSource="detailInfo.provideRecordList"-->
<!-- :columns="columns"-->
<!-- rowKey="id"-->
<!-- :pagination="false"-->
<!-- bordered-->
<!-- >-->
<!-- </a-table>-->
<!-- <a-descriptions bordered :column="1" class="remark_info folvite_title ">-->
<!-- <a-descriptions-item label="备注">-->
<!-- {{detailInfo.remarks || '&#45;&#45;'}}-->
<!-- </a-descriptions-item>-->
<!-- </a-descriptions>-->
</div>
<div style="text-align: center;margin-top: 40px">
<a-button class="ant-table-btn" @click="goBack">关闭</a-button>
......@@ -162,124 +119,120 @@
</div>
</template>
<script>
import moment from 'moment';
import {closedDetail} from "../../../utils/common";
import router from "../../../../router";
import {getEnumByFlag} from "../../../utils/common";
const columns = [
{
title: '供应商',
dataIndex: 'supplierName',
ellipsis: true
},
{
title: '品牌',
dataIndex: 'brandName',
ellipsis: true
},
{
title: '批次号',
dataIndex: 'batchNumber',
ellipsis: true
},
{
title: '当前库存',
dataIndex: 'number',
ellipsis: true
},
{
title: '发放数量',
dataIndex: 'sendNumber',
ellipsis: true
},
]
export default {
data() {
return {
routerParams: {},
detailInfo: {},
spinning: false,
bookHtmlContent: {content: undefined},
columns,
showVisible: false
export default {
data() {
return {
routerParams: {},
detailInfo: {},
spinning: false,
bookHtmlContent: {content: undefined},
showVisible: false,
plainOptions: {},
checkedList: [],
}
},
created() {
let questionEnum = getEnumByFlag('folacin_resident_info_question');
questionEnum.forEach(enums => {
this.plainOptions["key" + enums.enumValue] = enums.enumName;
});
this.routerParams = this.$route.query;
this.getStockListDetail()
this.getBookHtmlContent()
},
methods: {
getBookHtmlContent() {//获取用户知情书模板
let par = {
menuId: this.routerParams.menuId
}
},
created() {
this.routerParams = this.$route.query
this.getStockListDetail()
this.getBookHtmlContent()
},
methods: {
getBookHtmlContent() {//获取用户知情书模板
let par = {
menuId: this.routerParams.menuId
this.$api.common.fetchConsentInfo(par).then(({data}) => {
if (this.$api.utils.isBlank(data)) {
this.bookHtmlContent = {content: ""}
} else {
this.bookHtmlContent = data;
}
this.$api.common.fetchConsentInfo(par).then(({data}) => {
if (this.$api.utils.isBlank(data)) {
this.bookHtmlContent = {content: ""}
} else {
this.bookHtmlContent = data;
}
})
},
getStockListDetail() {
this.spinning = true
let par = {
residentId: this.routerParams.id,
menuId: this.routerParams.menuId
})
},
getStockListDetail() {
this.spinning = true
let par = {
residentId: this.routerParams.id,
menuId: this.routerParams.menuId
}
this.$api.folviteDistributionManage.fetchFolviteDistributionDetail(par).then(({data = [], code}) => {
this.spinning = false;
this.detailInfo = data;
if (data.question) {
let questionList = data.question.split(",");
questionList.forEach(x => {
this.checkedList.push(this.plainOptions["key"+x]);
})
}
this.$api.folviteDistributionManage.fetchFolviteDistributionDetail(par).then(({data = [], code}) => {
this.spinning = false;
this.detailInfo = data
})
},
goBack() {
window.top.postMessage({messageType:'THIRD_PAGECHANGE',name:`${this.routerParams.menuCode}`,source:"yesuan"}, '*')
// this.$router.push("/Home/folviteDistribution");
// closedDetail('/inStock/inStockManageDetail', '/Home/folviteDistribution')
},
})
},
}
goBack() {
if (process.env.NODE_ENV == "dev") {
this.$router.push("/Home/folviteDistribution");
} else {
window.top.postMessage({
messageType: 'THIRD_PAGECHANGE',
name: `${this.routerParams.menuCode}`,
source: "yesuan"
}, '*')
}
},
},
}
</script>
<style lang="less" scoped>
.detail_title {
padding: .1px 16px;
border: 1px solid #F0F0F0;
border-bottom: 0px
}
.detail_title {
padding: .1px 16px;
border: 1px solid #F0F0F0;
border-bottom: 0px
}
/deep/ .ant-checkbox-wrapper {
width: 800px;
}
/deep/ .ant-checkbox-wrapper-disabled span {
color: rgba(37, 37, 37, 1);
}
</style>
<style lang="less">
.no_border {
border-top: 0px;
}
.no_border {
border-top: 0px;
}
.folvite_title {
.ant-descriptions-item-label {
width: 135px;
}
}
.folvite_title {
.ant-descriptions-item-label {
width: 135px;
}
}
.card_info {
.ant-card-head-title {
padding: 9px 0px !important;
}
.card_info {
.ant-card-head-title {
padding: 9px 0px !important;
}
.ant-card-head {
min-height: 32px;
}
.ant-card-head {
min-height: 32px;
}
.ant-card-bordered {
border-top: 0px !important;
border-bottom: 0px !important;
}
}
.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;
}
}
.remark_info {
.ant-descriptions-view {
.ant-descriptions-bordered .ant-descriptions-view {
border: 0px !important;
}
}
}
</style>
src/views/indexComponent/folviteDistribution/folviteDistribution.vue
View file @ fafa6b6f
......@@ -45,12 +45,20 @@
</template>
<template slot="action" slot-scope="record">
<a-button class="ant-table-btn" size="small" @click="toDetail(record)">查看</a-button>
<a-button style="margin-left: 10px" class="ant-table-btn" size="small" @click="updateRecord(record)">修改
</a-button>
<a-popconfirm placement="top" @confirm="deleteRecord(record)" cancelText="取消" okText="确认">
<template slot="title">
<p>确认删除吗？</p>
</template>
<a-button style="margin-left: 10px" class="ant-table-btn" size="small">删除</a-button>
</a-popconfirm>
<a-button class="ant-table-btn" v-if="record.source===1&&record.isSigned===2" size="small"
style="margin-left: 10px"
@click="uploadConsentInfo(record)">签署知情同意书
@click="uploadConsentInfo(record)">签署同意书
</a-button>
<a-button class="ant-table-btn" v-else size="small" style="margin-left: 10px"
@click="showConsentInfo(record)">已签知情同意书
@click="showConsentInfo(record)">已签同意书
</a-button>
</template>
</a-table>
......@@ -136,7 +144,7 @@ const columns = [
{
title: '姓名',
dataIndex: 'womanName',
width: '100px'
width: '100px', ellipsis: true,
},
{
title: '证件类型',
......@@ -148,24 +156,16 @@ const columns = [
dataIndex: 'womenIdCard',
width: '180px'
},
{
title: '发放数量',
dataIndex: 'provideNumber',
width: '100px'
},
{
title: '联系电话',
dataIndex: 'telephone',
width: '140px'
},
/* {
title: '发放时期',
width: '120px',
scopedSlots: {customRender: 'expireDateS'},
},*/
{
title: '现住址',
// dataIndex: 'nowAddress',
key: 'nowAddress',
width: '200px',
ellipsis: true,
scopedSlots: {customRender: 'nowAddress'},
},
{
title: '发放医生',
dataIndex: 'provideDoctorName',
......@@ -176,11 +176,18 @@ const columns = [
dataIndex: 'sourceName',
width: '140px'
},
{
title: '现住址',
// dataIndex: 'nowAddress',
key: 'nowAddress',
ellipsis: true,
scopedSlots: {customRender: 'nowAddress'},
},
{
title: '操作',
fixed: 'right',
align: 'left',
width: "240px",
width: "300px",
scopedSlots: {customRender: 'action'},
},
]
......@@ -228,7 +235,7 @@ export default {
window.sessionStorage.setItem('menuId', this.routerParams.menuId);
this.menuId = this.routerParams.menuId;
}
this.getFolviteDistributionList();
this.getDataList();
},
methods: {
getIdCardInfo() {
......@@ -238,10 +245,10 @@ export default {
})
},
searchList() {
this.pagination.pageIndex = 1
this.getFolviteDistributionList()
this.pagination.pageIndex = 1;
this.getDataList();
},
getFolviteDistributionList() {
getDataList() {
this.loading = true
let pars = isEmptyParams(this.searchForm)
let par = {
......@@ -251,7 +258,7 @@ export default {
menuId: this.menuId
}
this.$api.folviteDistributionManage.fetchFolviteDistributionList(par).then(({data = {}}) => {
const {dataList = [], total = 0} = data
const {dataList = [], total = 0} = data;
this.tableData = dataList
this.pagination.total = total
this.loading = false
......@@ -263,12 +270,12 @@ export default {
showSizeChange(pageNum, pageSize) {
this.pagination.pageIndex = 1;
this.pagination.pageSize = pageSize;
this.getFolviteDistributionList()
this.getDataList()
},
change(pageNum, pageSize) {
this.pagination.pageIndex = pageNum;
this.pagination.pageSize = pageSize;
this.getFolviteDistributionList()
this.getDataList()
},
restSearchForm() {
this.searchForm = {
......@@ -276,9 +283,6 @@ export default {
}
this.searchList()
},
// getContainer() {
// return window.parent.document.body
// },
toAdd() {
if (process.env.NODE_ENV == "dev") {
this.$router.push({path: '/folviteDistribution/add', query: {routerFlag: 'add', menuId: this.menuId}})
......@@ -299,6 +303,29 @@ export default {
window.top.postMessage({messageType: 'THIRD_PAGEADD', title: `查看详情`, url: now_location}, '*')
}
},
updateRecord(record) {
if (process.env.NODE_ENV == "dev") {
let params = {
id: record.id,
routerFlag: 'updateRecord',
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}, '*')
}
},
deleteRecord(record) {
this.$api.folviteDistributionManage.fetchFolviteDelete(record.id).then(({data = [], code}) => {
if (code == 'SUCCESS') {
this.$message.success("删除成功！");
this.getDataList();
} else {
this.$message.error("删除失败！");
}
})
},
uploadConsentInfo(row) {
this.formData.id = row.id;
this.visible = true;
......@@ -335,7 +362,7 @@ export default {
}
return file;
});
if (fileList.length==0){
if (fileList.length == 0) {
this.formData.consentId = "";
}
this.fileList = fileList;
......@@ -398,7 +425,7 @@ export default {
}*/
.ellipsis {
display: block;
width: 180px;
width: 100%;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
......
yarn.lock
View file @ fafa6b6f
......@@ -1567,7 +1567,7 @@ acorn@^7.1.1, acorn@^7.4.0:
add-dom-event-listener@^1.0.2:
version "1.1.0"
resolved "https://registry.nlark.com/add-dom-event-listener/download/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310"
resolved "https://registry.npmmirror.com/add-dom-event-listener/download/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310"
integrity sha1-apLbOg3Qq8JU4JXA8dwUrLuq4xA=
dependencies:
object-assign "4.x"
......@@ -1670,7 +1670,7 @@ ansi-styles@^4.1.0:
ant-design-vue@^1.7.8:
version "1.7.8"
resolved "https://registry.npmmirror.com/ant-design-vue/download/ant-design-vue-1.7.8.tgz#1abbf86b68a4f5b1000bea0487b8031dc0001661"
integrity sha1-Grv4a2ik9bEAC+oEh7gDHcAAFmE=
integrity sha512-F1hmiS9vwbyfuFvlamdW5l9bHKqRlj9wHaGDIE41NZMWXyWy8qL0UFa/+I0Wl8gQWZCqODW5pN6Yfoyn85At3A==
dependencies:
"@ant-design/icons" "^2.1.1"
"@ant-design/icons-vue" "^2.0.0"
......@@ -2795,7 +2795,7 @@ core-js-compat@^3.6.2, core-js-compat@^3.6.5:
core-js@^2.4.0:
version "2.6.12"
resolved "https://registry.npmmirror.com/core-js/download/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
integrity sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw=
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
core-js@^3.6.5:
version "3.6.5"
......@@ -6701,8 +6701,8 @@ regenerate@^1.4.0:
regenerator-runtime@^0.11.0:
version "0.11.1"
resolved "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
integrity sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk=
resolved "https://registry.npmmirror.com/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
regenerator-runtime@^0.13.4:
version "0.13.7"
......
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