Skip to content

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

需求更新

parent db422725
Expand all Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 36 deletions
.env.dev
View file @ fafa6b6f
NODE_ENV = dev 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_URL1 = https://ys-service.yiboshi.com
VUE_APP_BASE_URL111 = http://59.230.237.90:8115 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_BASE_PATH = https://beta-yac.yiboshi.com
VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B' VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'
......
src/api/index.js
View file @ fafa6b6f
...@@ -205,6 +205,12 @@ export default { ...@@ -205,6 +205,12 @@ export default {
fetchFolviteUploadConsent(params) {//上传知情同意书 fetchFolviteUploadConsent(params) {//上传知情同意书
return fetch(`/v1/folacin-admin/folacin-resident-info/upload-consent/${params.id}/${params.consentId}`, {}, 'post') 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: { allocationManagement: {
......
src/views/indexComponent/folviteDistribution/folviteDistribution.vue
View file @ fafa6b6f
...@@ -45,12 +45,20 @@ ...@@ -45,12 +45,20 @@
</template> </template>
<template slot="action" slot-scope="record"> <template slot="action" slot-scope="record">
<a-button class="ant-table-btn" size="small" @click="toDetail(record)">查看</a-button> <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" <a-button class="ant-table-btn" v-if="record.source===1&&record.isSigned===2" size="small"
style="margin-left: 10px" style="margin-left: 10px"
@click="uploadConsentInfo(record)">签署知情同意书 @click="uploadConsentInfo(record)">签署同意书
</a-button> </a-button>
<a-button class="ant-table-btn" v-else size="small" style="margin-left: 10px" <a-button class="ant-table-btn" v-else size="small" style="margin-left: 10px"
@click="showConsentInfo(record)">已签知情同意书 @click="showConsentInfo(record)">已签同意书
</a-button> </a-button>
</template> </template>
</a-table> </a-table>
...@@ -136,7 +144,7 @@ const columns = [ ...@@ -136,7 +144,7 @@ const columns = [
{ {
title: '姓名', title: '姓名',
dataIndex: 'womanName', dataIndex: 'womanName',
width: '100px' width: '100px', ellipsis: true,
}, },
{ {
title: '证件类型', title: '证件类型',
...@@ -148,24 +156,16 @@ const columns = [ ...@@ -148,24 +156,16 @@ const columns = [
dataIndex: 'womenIdCard', dataIndex: 'womenIdCard',
width: '180px' width: '180px'
}, },
{
title: '发放数量',
dataIndex: 'provideNumber',
width: '100px'
},
{ {
title: '联系电话', title: '联系电话',
dataIndex: 'telephone', dataIndex: 'telephone',
width: '140px' width: '140px'
}, },
/* {
title: '发放时期',
width: '120px',
scopedSlots: {customRender: 'expireDateS'},
},*/
{
title: '现住址',
// dataIndex: 'nowAddress',
key: 'nowAddress',
width: '200px',
ellipsis: true,
scopedSlots: {customRender: 'nowAddress'},
},
{ {
title: '发放医生', title: '发放医生',
dataIndex: 'provideDoctorName', dataIndex: 'provideDoctorName',
...@@ -176,11 +176,18 @@ const columns = [ ...@@ -176,11 +176,18 @@ const columns = [
dataIndex: 'sourceName', dataIndex: 'sourceName',
width: '140px' width: '140px'
}, },
{
title: '现住址',
// dataIndex: 'nowAddress',
key: 'nowAddress',
ellipsis: true,
scopedSlots: {customRender: 'nowAddress'},
},
{ {
title: '操作', title: '操作',
fixed: 'right', fixed: 'right',
align: 'left', align: 'left',
width: "240px", width: "300px",
scopedSlots: {customRender: 'action'}, scopedSlots: {customRender: 'action'},
}, },
] ]
...@@ -228,7 +235,7 @@ export default { ...@@ -228,7 +235,7 @@ export default {
window.sessionStorage.setItem('menuId', this.routerParams.menuId); window.sessionStorage.setItem('menuId', this.routerParams.menuId);
this.menuId = this.routerParams.menuId; this.menuId = this.routerParams.menuId;
} }
this.getFolviteDistributionList(); this.getDataList();
}, },
methods: { methods: {
getIdCardInfo() { getIdCardInfo() {
...@@ -238,10 +245,10 @@ export default { ...@@ -238,10 +245,10 @@ export default {
}) })
}, },
searchList() { searchList() {
this.pagination.pageIndex = 1 this.pagination.pageIndex = 1;
this.getFolviteDistributionList() this.getDataList();
}, },
getFolviteDistributionList() { getDataList() {
this.loading = true this.loading = true
let pars = isEmptyParams(this.searchForm) let pars = isEmptyParams(this.searchForm)
let par = { let par = {
...@@ -251,7 +258,7 @@ export default { ...@@ -251,7 +258,7 @@ export default {
menuId: this.menuId menuId: this.menuId
} }
this.$api.folviteDistributionManage.fetchFolviteDistributionList(par).then(({data = {}}) => { this.$api.folviteDistributionManage.fetchFolviteDistributionList(par).then(({data = {}}) => {
const {dataList = [], total = 0} = data const {dataList = [], total = 0} = data;
this.tableData = dataList this.tableData = dataList
this.pagination.total = total this.pagination.total = total
this.loading = false this.loading = false
...@@ -263,12 +270,12 @@ export default { ...@@ -263,12 +270,12 @@ export default {
showSizeChange(pageNum, pageSize) { showSizeChange(pageNum, pageSize) {
this.pagination.pageIndex = 1; this.pagination.pageIndex = 1;
this.pagination.pageSize = pageSize; this.pagination.pageSize = pageSize;
this.getFolviteDistributionList() this.getDataList()
}, },
change(pageNum, pageSize) { change(pageNum, pageSize) {
this.pagination.pageIndex = pageNum; this.pagination.pageIndex = pageNum;
this.pagination.pageSize = pageSize; this.pagination.pageSize = pageSize;
this.getFolviteDistributionList() this.getDataList()
}, },
restSearchForm() { restSearchForm() {
this.searchForm = { this.searchForm = {
...@@ -276,9 +283,6 @@ export default { ...@@ -276,9 +283,6 @@ export default {
} }
this.searchList() this.searchList()
}, },
// getContainer() {
// return window.parent.document.body
// },
toAdd() { toAdd() {
if (process.env.NODE_ENV == "dev") { if (process.env.NODE_ENV == "dev") {
this.$router.push({path: '/folviteDistribution/add', query: {routerFlag: 'add', menuId: this.menuId}}) this.$router.push({path: '/folviteDistribution/add', query: {routerFlag: 'add', menuId: this.menuId}})
...@@ -299,6 +303,29 @@ export default { ...@@ -299,6 +303,29 @@ export default {
window.top.postMessage({messageType: 'THIRD_PAGEADD', title: `查看详情`, url: now_location}, '*') 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) { uploadConsentInfo(row) {
this.formData.id = row.id; this.formData.id = row.id;
this.visible = true; this.visible = true;
...@@ -335,7 +362,7 @@ export default { ...@@ -335,7 +362,7 @@ export default {
} }
return file; return file;
}); });
if (fileList.length==0){ if (fileList.length == 0) {
this.formData.consentId = ""; this.formData.consentId = "";
} }
this.fileList = fileList; this.fileList = fileList;
...@@ -398,7 +425,7 @@ export default { ...@@ -398,7 +425,7 @@ export default {
}*/ }*/
.ellipsis { .ellipsis {
display: block; display: block;
width: 180px; width: 100%;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
......
yarn.lock
View file @ fafa6b6f
...@@ -1567,7 +1567,7 @@ acorn@^7.1.1, acorn@^7.4.0: ...@@ -1567,7 +1567,7 @@ acorn@^7.1.1, acorn@^7.4.0:
add-dom-event-listener@^1.0.2: add-dom-event-listener@^1.0.2:
version "1.1.0" 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= integrity sha1-apLbOg3Qq8JU4JXA8dwUrLuq4xA=
dependencies: dependencies:
object-assign "4.x" object-assign "4.x"
...@@ -1670,7 +1670,7 @@ ansi-styles@^4.1.0: ...@@ -1670,7 +1670,7 @@ ansi-styles@^4.1.0:
ant-design-vue@^1.7.8: ant-design-vue@^1.7.8:
version "1.7.8" version "1.7.8"
resolved "https://registry.npmmirror.com/ant-design-vue/download/ant-design-vue-1.7.8.tgz#1abbf86b68a4f5b1000bea0487b8031dc0001661" 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: dependencies:
"@ant-design/icons" "^2.1.1" "@ant-design/icons" "^2.1.1"
"@ant-design/icons-vue" "^2.0.0" "@ant-design/icons-vue" "^2.0.0"
...@@ -2795,7 +2795,7 @@ core-js-compat@^3.6.2, core-js-compat@^3.6.5: ...@@ -2795,7 +2795,7 @@ core-js-compat@^3.6.2, core-js-compat@^3.6.5:
core-js@^2.4.0: core-js@^2.4.0:
version "2.6.12" version "2.6.12"
resolved "https://registry.npmmirror.com/core-js/download/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" 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: core-js@^3.6.5:
version "3.6.5" version "3.6.5"
...@@ -6701,8 +6701,8 @@ regenerate@^1.4.0: ...@@ -6701,8 +6701,8 @@ regenerate@^1.4.0:
regenerator-runtime@^0.11.0: regenerator-runtime@^0.11.0:
version "0.11.1" 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" resolved "https://registry.npmmirror.com/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
integrity sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk= integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
regenerator-runtime@^0.13.4: regenerator-runtime@^0.13.4:
version "0.13.7" 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