Skip to content

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

细节完善

parent ea172a4d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 143 deletions
.env.dev
View file @ 95fc1bde
NODE_ENV = dev NODE_ENV = dev
VUE_APP_BASE_URL = https://beta-ysservice.yiboshi.com VUE_APP_BASE_URL2 = 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_URL1 = https://yyys-service.yiboshi.com VUE_APP_BASE_URL1 = https://yyys-service.yiboshi.com
VUE_APP_BASE_URL1 = http://127.0.0.1:8082 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'
VUE_APP_LOCATION = https://beta-yesuan.yiboshi.com/#/ VUE_APP_LOCATION2 = https://beta-yesuan.yiboshi.com/#/
VUE_APP_LOCATION1 = https://yesuan.yiboshi.com/#/ VUE_APP_LOCATION1 = https://yesuan.yiboshi.com/#/
VUE_APP_LOCATION = http://127.0.0.1:8080/#/
.env.yueyang
View file @ 95fc1bde
NODE_ENV = yueyang NODE_ENV = yueyang
VUE_APP_BASE_URL1 = https://beta-ysservice.yiboshi.com VUE_APP_BASE_URL = https://yyyesuan-service.yyjtzc.com
VUE_APP_BASE_URL =https://yyys-service.yiboshi.com
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'
package-lock.json
View file @ 95fc1bde
...@@ -5,23 +5,22 @@ ...@@ -5,23 +5,22 @@
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "folvite-distribution-front",
"version": "0.1.0", "version": "0.1.0",
"dependencies": { "dependencies": {
"ant-design-vue": "^1.6.4", "ant-design-vue": "^1.7.8",
"axios": "^0.19.2", "axios": "^0.19.2",
"compression-webpack-plugin": "5.0.0", "compression-webpack-plugin": "5.0.0",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"crypto-js": "^4.0.0",
"http-parser-js": "^0.5.3", "http-parser-js": "^0.5.3",
"jsonp": "^0.2.1",
"moment": "^2.29.1", "moment": "^2.29.1",
"moment-locales-webpack-plugin": "^1.2.0", "moment-locales-webpack-plugin": "^1.2.0",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"print-js": "^1.6.0", "print-js": "^1.6.0",
"signature_pad": "^3.0.0-beta.4",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-qr": "^2.3.0", "vue-qr": "^2.3.0",
"vue-router": "^3.2.0", "vue-router": "^3.2.0",
"vue-signature-pad": "^2.0.2",
"vue-ueditor-wrap": "^2.4.4", "vue-ueditor-wrap": "^2.4.4",
"vuex": "^3.4.0" "vuex": "^3.4.0"
}, },
...@@ -3385,9 +3384,10 @@ ...@@ -3385,9 +3384,10 @@
} }
}, },
"node_modules/ant-design-vue": { "node_modules/ant-design-vue": {
"version": "1.6.4", "version": "1.7.8",
"resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.6.4.tgz", "resolved": "https://registry.npmmirror.com/ant-design-vue/download/ant-design-vue-1.7.8.tgz",
"integrity": "sha512-BQ37Vcw6itMIsa+UFr+ad4I3Tx6ZYAPnComvWXQwWqDuVIW4A0M5X+nY/pTTIaH9cPSxMse8KUSUu0ibuYj3Ag==", "integrity": "sha1-Grv4a2ik9bEAC+oEh7gDHcAAFmE=",
"hasInstallScript": true,
"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",
...@@ -3421,8 +3421,8 @@ ...@@ -3421,8 +3421,8 @@
"warning": "^4.0.0" "warning": "^4.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"vue": ">=2.6.0", "vue": "^2.6.0",
"vue-template-compiler": ">=2.6.0" "vue-template-compiler": "^2.6.0"
} }
}, },
"node_modules/any-promise": { "node_modules/any-promise": {
...@@ -5528,11 +5528,6 @@ ...@@ -5528,11 +5528,6 @@
"node": "*" "node": "*"
} }
}, },
"node_modules/crypto-js": {
"version": "4.1.1",
"resolved": "https://registry.nlark.com/crypto-js/download/crypto-js-4.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcrypto-js%2Fdownload%2Fcrypto-js-4.1.1.tgz",
"integrity": "sha1-nkhbzwNSEEG9hYRHhrg/t2GXNs8="
},
"node_modules/css-color-names": { "node_modules/css-color-names": {
"version": "0.0.4", "version": "0.0.4",
"resolved": "https://registry.npm.taobao.org/css-color-names/download/css-color-names-0.0.4.tgz", "resolved": "https://registry.npm.taobao.org/css-color-names/download/css-color-names-0.0.4.tgz",
...@@ -8570,11 +8565,6 @@ ...@@ -8570,11 +8565,6 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/js-base64": {
"version": "3.6.1",
"resolved": "https://registry.nlark.com/js-base64/download/js-base64-3.6.1.tgz",
"integrity": "sha1-VVquOYt0aUtAN68filpiCdFw774="
},
"node_modules/js-message": { "node_modules/js-message": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npm.taobao.org/js-message/download/js-message-1.0.5.tgz", "resolved": "https://registry.npm.taobao.org/js-message/download/js-message-1.0.5.tgz",
...@@ -8693,6 +8683,27 @@ ...@@ -8693,6 +8683,27 @@
"graceful-fs": "^4.1.6" "graceful-fs": "^4.1.6"
} }
}, },
"node_modules/jsonp": {
"version": "0.2.1",
"resolved": "https://registry.npm.taobao.org/jsonp/download/jsonp-0.2.1.tgz",
"integrity": "sha1-pltPoPEL2nGaBUQep7lMVfPhW64=",
"dependencies": {
"debug": "^2.1.3"
}
},
"node_modules/jsonp/node_modules/debug": {
"version": "2.6.9",
"resolved": "https://registry.npmmirror.com/debug/download/debug-2.6.9.tgz?cache=0&sync_timestamp=1636300872595&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz",
"integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
"dependencies": {
"ms": "2.0.0"
}
},
"node_modules/jsonp/node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/ms/download/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"node_modules/jsprim": { "node_modules/jsprim": {
"version": "1.4.1", "version": "1.4.1",
"resolved": "https://registry.npm.taobao.org/jsprim/download/jsprim-1.4.1.tgz", "resolved": "https://registry.npm.taobao.org/jsprim/download/jsprim-1.4.1.tgz",
...@@ -12734,14 +12745,6 @@ ...@@ -12734,14 +12745,6 @@
"webpack": "^2.0.0 || ^3.0.0 || ^4.0.0" "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0"
} }
}, },
"node_modules/throttle-debounce": {
"version": "2.3.0",
"resolved": "https://registry.nlark.com/throttle-debounce/download/throttle-debounce-2.3.0.tgz",
"integrity": "sha1-/TGGXmZQIHHkEYF+JBRls+nDcuI=",
"engines": {
"node": ">=8"
}
},
"node_modules/through2": { "node_modules/through2": {
"version": "2.0.5", "version": "2.0.5",
"resolved": "https://registry.npm.taobao.org/through2/download/through2-2.0.5.tgz?cache=0&sync_timestamp=1593478628425&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthrough2%2Fdownload%2Fthrough2-2.0.5.tgz", "resolved": "https://registry.npm.taobao.org/through2/download/through2-2.0.5.tgz?cache=0&sync_timestamp=1593478628425&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthrough2%2Fdownload%2Fthrough2-2.0.5.tgz",
...@@ -13280,19 +13283,6 @@ ...@@ -13280,19 +13283,6 @@
"uuid": "bin/uuid" "uuid": "bin/uuid"
} }
}, },
"node_modules/v-viewer": {
"version": "1.6.4",
"resolved": "https://registry.nlark.com/v-viewer/download/v-viewer-1.6.4.tgz?cache=0&sync_timestamp=1626094459396&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fv-viewer%2Fdownload%2Fv-viewer-1.6.4.tgz",
"integrity": "sha1-OeNrU0uqs0B2+4FnBManNN4Nxy8=",
"dependencies": {
"throttle-debounce": "^2.0.1",
"viewerjs": "^1.5.0"
},
"engines": {
"node": ">=4",
"npm": ">=3"
}
},
"node_modules/validate-npm-package-license": { "node_modules/validate-npm-package-license": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npm.taobao.org/validate-npm-package-license/download/validate-npm-package-license-3.0.4.tgz", "resolved": "https://registry.npm.taobao.org/validate-npm-package-license/download/validate-npm-package-license-3.0.4.tgz",
...@@ -13332,11 +13322,6 @@ ...@@ -13332,11 +13322,6 @@
"extsprintf": "^1.2.0" "extsprintf": "^1.2.0"
} }
}, },
"node_modules/viewerjs": {
"version": "1.10.1",
"resolved": "https://registry.nlark.com/viewerjs/download/viewerjs-1.10.1.tgz",
"integrity": "sha1-B0me0EPQop4wArkPVcWyKL0adCw="
},
"node_modules/vm-browserify": { "node_modules/vm-browserify": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
...@@ -17230,9 +17215,9 @@ ...@@ -17230,9 +17215,9 @@
} }
}, },
"ant-design-vue": { "ant-design-vue": {
"version": "1.6.4", "version": "1.7.8",
"resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.6.4.tgz", "resolved": "https://registry.npmmirror.com/ant-design-vue/download/ant-design-vue-1.7.8.tgz",
"integrity": "sha512-BQ37Vcw6itMIsa+UFr+ad4I3Tx6ZYAPnComvWXQwWqDuVIW4A0M5X+nY/pTTIaH9cPSxMse8KUSUu0ibuYj3Ag==", "integrity": "sha1-Grv4a2ik9bEAC+oEh7gDHcAAFmE=",
"requires": { "requires": {
"@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",
...@@ -19061,11 +19046,6 @@ ...@@ -19061,11 +19046,6 @@
"randomfill": "^1.0.3" "randomfill": "^1.0.3"
} }
}, },
"crypto-js": {
"version": "4.1.1",
"resolved": "https://registry.nlark.com/crypto-js/download/crypto-js-4.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcrypto-js%2Fdownload%2Fcrypto-js-4.1.1.tgz",
"integrity": "sha1-nkhbzwNSEEG9hYRHhrg/t2GXNs8="
},
"css-color-names": { "css-color-names": {
"version": "0.0.4", "version": "0.0.4",
"resolved": "https://registry.npm.taobao.org/css-color-names/download/css-color-names-0.0.4.tgz", "resolved": "https://registry.npm.taobao.org/css-color-names/download/css-color-names-0.0.4.tgz",
...@@ -21562,11 +21542,6 @@ ...@@ -21562,11 +21542,6 @@
} }
} }
}, },
"js-base64": {
"version": "3.6.1",
"resolved": "https://registry.nlark.com/js-base64/download/js-base64-3.6.1.tgz",
"integrity": "sha1-VVquOYt0aUtAN68filpiCdFw774="
},
"js-message": { "js-message": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npm.taobao.org/js-message/download/js-message-1.0.5.tgz", "resolved": "https://registry.npm.taobao.org/js-message/download/js-message-1.0.5.tgz",
...@@ -21664,6 +21639,29 @@ ...@@ -21664,6 +21639,29 @@
"graceful-fs": "^4.1.6" "graceful-fs": "^4.1.6"
} }
}, },
"jsonp": {
"version": "0.2.1",
"resolved": "https://registry.npm.taobao.org/jsonp/download/jsonp-0.2.1.tgz",
"integrity": "sha1-pltPoPEL2nGaBUQep7lMVfPhW64=",
"requires": {
"debug": "^2.1.3"
},
"dependencies": {
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmmirror.com/debug/download/debug-2.6.9.tgz?cache=0&sync_timestamp=1636300872595&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz",
"integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
"requires": {
"ms": "2.0.0"
}
},
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/ms/download/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
}
}
},
"jsprim": { "jsprim": {
"version": "1.4.1", "version": "1.4.1",
"resolved": "https://registry.npm.taobao.org/jsprim/download/jsprim-1.4.1.tgz", "resolved": "https://registry.npm.taobao.org/jsprim/download/jsprim-1.4.1.tgz",
...@@ -25103,11 +25101,6 @@ ...@@ -25103,11 +25101,6 @@
"neo-async": "^2.6.0" "neo-async": "^2.6.0"
} }
}, },
"throttle-debounce": {
"version": "2.3.0",
"resolved": "https://registry.nlark.com/throttle-debounce/download/throttle-debounce-2.3.0.tgz",
"integrity": "sha1-/TGGXmZQIHHkEYF+JBRls+nDcuI="
},
"through2": { "through2": {
"version": "2.0.5", "version": "2.0.5",
"resolved": "https://registry.npm.taobao.org/through2/download/through2-2.0.5.tgz?cache=0&sync_timestamp=1593478628425&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthrough2%2Fdownload%2Fthrough2-2.0.5.tgz", "resolved": "https://registry.npm.taobao.org/through2/download/through2-2.0.5.tgz?cache=0&sync_timestamp=1593478628425&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthrough2%2Fdownload%2Fthrough2-2.0.5.tgz",
...@@ -25555,15 +25548,6 @@ ...@@ -25555,15 +25548,6 @@
"integrity": "sha1-sj5DWK+oogL+ehAK8fX4g/AgB+4=", "integrity": "sha1-sj5DWK+oogL+ehAK8fX4g/AgB+4=",
"dev": true "dev": true
}, },
"v-viewer": {
"version": "1.6.4",
"resolved": "https://registry.nlark.com/v-viewer/download/v-viewer-1.6.4.tgz?cache=0&sync_timestamp=1626094459396&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fv-viewer%2Fdownload%2Fv-viewer-1.6.4.tgz",
"integrity": "sha1-OeNrU0uqs0B2+4FnBManNN4Nxy8=",
"requires": {
"throttle-debounce": "^2.0.1",
"viewerjs": "^1.5.0"
}
},
"validate-npm-package-license": { "validate-npm-package-license": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npm.taobao.org/validate-npm-package-license/download/validate-npm-package-license-3.0.4.tgz", "resolved": "https://registry.npm.taobao.org/validate-npm-package-license/download/validate-npm-package-license-3.0.4.tgz",
...@@ -25597,11 +25581,6 @@ ...@@ -25597,11 +25581,6 @@
"extsprintf": "^1.2.0" "extsprintf": "^1.2.0"
} }
}, },
"viewerjs": {
"version": "1.10.1",
"resolved": "https://registry.nlark.com/viewerjs/download/viewerjs-1.10.1.tgz",
"integrity": "sha1-B0me0EPQop4wArkPVcWyKL0adCw="
},
"vm-browserify": { "vm-browserify": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
......
package.json
View file @ 95fc1bde
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve --mode dev", "serve-dev": "vue-cli-service serve --mode dev",
"build:test": "vue-cli-service build --mode test", "build:test": "vue-cli-service build --mode test",
"build:prod": "vue-cli-service build --mode production --report", "build:prod": "vue-cli-service build --mode production --report",
"build:yueyang": "vue-cli-service build --mode yueyang" "build:yueyang": "vue-cli-service build --mode yueyang"
......
src/views/Home.vue
View file @ 95fc1bde
...@@ -54,13 +54,15 @@ ...@@ -54,13 +54,15 @@
}, },
created() { created() {
//获取妇幼权限和登录基本信息 //获取妇幼权限和登录基本信息
// document.cookie = 'bGNnd3lwdF9hdA=c64fae79-c4a9-485d-8828-38779bb3b5d2;'//昆明市 document.cookie = 'bGNnd3lwdF9hdA=1eb43b49-3b8f-4902-8616-dfe2283f1c03;'//昆明市
// document.cookie = 'bGNnd3lwdF9hdA=' + sessionStorage.getItem("loginToken") + ';'//云南省 // document.cookie = 'bGNnd3lwdF9hdA=' + sessionStorage.getItem("loginToken") + ';'//云南省
let cookieToken = getCookie('bGNnd3lwdF9hdA'); let cookieToken = getCookie('bGNnd3lwdF9hdA');
console.log('tokenInfo',cookieToken) console.log('tokenInfo',cookieToken)
if (cookieToken) {//根据cookie获取token并调用接口获取菜单并设置初始选中菜单 if (cookieToken) {//根据cookie获取token并调用接口获取菜单并设置初始选中菜单
window.sessionStorage.setItem('token', 'bearer' + ' ' + cookieToken); window.sessionStorage.setItem('token', 'bearer' + ' ' + cookieToken);
let par = {} let query=this.$route.query;
let par = {menuId:query.menuId};
console.log("query",query);
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => { this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
// window.sessionStorage.setItem('menuList', JSON.stringify(data.menuList)); // window.sessionStorage.setItem('menuList', JSON.stringify(data.menuList));
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo)); window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
......
src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue
View file @ 95fc1bde
...@@ -27,30 +27,39 @@ ...@@ -27,30 +27,39 @@
<a-descriptions-item label="证件号码"> <a-descriptions-item label="证件号码">
{{detailInfo.womenIdCard || '--'}} {{detailInfo.womenIdCard || '--'}}
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="是否曾经怀孕"> <a-descriptions-item label="出生日期">
{{detailInfo.oncePregnantName || '--'}} {{detailInfo.birthDate || '--'}}
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="孕次"> <!-- <a-descriptions-item label="是否曾经怀孕">-->
{{detailInfo.pregnantNum || '--'}} <!-- {{detailInfo.oncePregnantName || '&#45;&#45;'}}-->
<!-- </a-descriptions-item>-->
<!-- <a-descriptions-item label="孕次">-->
<!-- {{detailInfo.pregnantNum || '&#45;&#45;'}}-->
<!-- </a-descriptions-item>-->
<a-descriptions-item label="身高">
{{detailInfo.height || '--'}}
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> <a-descriptions-item label="体重">
<div class="detail_title" style="border-top: 0px"> {{detailInfo.weight || '--'}}
<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 || '--'}}
</a-descriptions-item>
<a-descriptions-item label="证件类型">
{{detailInfo.menCertificateTypeName || '--'}}
</a-descriptions-item>
<a-descriptions-item label="证件号码">
{{detailInfo.menIdCard || '--'}}
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> </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="detail_title" style="border-top: 0px">
<div class="divider_my_dashed"> <div class="divider_my_dashed">
<span class="midText" style="font-size: 14px;color: #FF4D80;">其他信息</span> <span class="midText" style="font-size: 14px;color: #FF4D80;">其他信息</span>
...@@ -110,25 +119,31 @@ ...@@ -110,25 +119,31 @@
<a-descriptions-item label="发放医生"> <a-descriptions-item label="发放医生">
{{detailInfo.provideDoctorName || '--'}} {{detailInfo.provideDoctorName || '--'}}
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> <a-descriptions-item label="建议服用">
<div class="detail_title" style="border-top: 0px"> {{detailInfo.recommendEat+"颗/天" || '--'}}
<div class="divider_my_dashed"> </a-descriptions-item>
<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="备注"> <a-descriptions-item label="备注">
{{detailInfo.remarks || '--'}} {{detailInfo.remarks || '--'}}
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> </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>
<div style="text-align: center;margin-top: 40px"> <div style="text-align: center;margin-top: 40px">
<a-button class="ant-table-btn" @click="goBack">关闭</a-button> <a-button class="ant-table-btn" @click="goBack">关闭</a-button>
......
src/views/indexComponent/folviteDistribution/folviteDistribution.vue
View file @ 95fc1bde
...@@ -6,11 +6,12 @@ ...@@ -6,11 +6,12 @@
<a-input v-model="searchForm.womenIdCard" placeholder="请输入证件号码" style="width: 250px"></a-input> <a-input v-model="searchForm.womenIdCard" placeholder="请输入证件号码" style="width: 250px"></a-input>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
<a-button class="search_btn ant-table-btn" @click="getIdCardInfo">读卡识别</a-button> <a-button class="search_btn ant-table-btn" @click="getIdCardInfo">读卡识别</a-button>
<a-button type="primary" icon="search" class="search_btn" style="margin-left: 10px" @click="searchList"> <a-button type="primary" icon="search" class="search_btn" style="margin-left: 10px" @click="searchList">
搜索 搜索
</a-button> </a-button>
<a-button class="search_btn ant-table-btn" icon="sync" style="margin-left: 10px" @click="restSearchForm">清空 <a-button class="search_btn ant-table-btn" icon="sync" style="margin-left: 10px"
@click="restSearchForm">清空
</a-button> </a-button>
</a-form-item> </a-form-item>
<a-button type="primary" class="search_btn" style="float: right" @click="toAdd">发放登记</a-button> <a-button type="primary" class="search_btn" style="float: right" @click="toAdd">发放登记</a-button>
...@@ -85,10 +86,11 @@ ...@@ -85,10 +86,11 @@
<div v-html="consentInfo" style="width: 100%"> <div v-html="consentInfo" style="width: 100%">
</div> </div>
<div style="float: right;margin-right: 10px"> <div style="float: right;margin-right: 10px">
<div style="height: 60px">签名： <img style="width:200px;height: 40px;display: inline-block" :src="applySignUrl" height="100%"/></div> <div style="height: 60px">签名： <img style="width:200px;height: 40px;display: inline-block"
:src="applySignUrl" height="100%"/></div>
<div>签署日期：<span style="margin-left: 8px">{{currentRow.parentDate}}</span></div> <div>签署日期：<span style="margin-left: 8px">{{currentRow.parentDate}}</span></div>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>
</div> </div>
</div> </div>
</a-modal> </a-modal>
...@@ -119,17 +121,17 @@ ...@@ -119,17 +121,17 @@
{ {
title: '姓名', title: '姓名',
dataIndex: 'womanName', dataIndex: 'womanName',
width:'140px' width: '140px'
}, },
{ {
title: '证件号码', title: '证件号码',
dataIndex: 'womenIdCard', dataIndex: 'womenIdCard',
width: '180px' width: '180px'
}, },
{ {
title: '联系电话', title: '联系电话',
dataIndex: 'telephone', dataIndex: 'telephone',
width: '140px' width: '140px'
}, },
/* { /* {
title: '发放时期', title: '发放时期',
...@@ -139,17 +141,17 @@ ...@@ -139,17 +141,17 @@
{ {
title: '现住址', title: '现住址',
dataIndex: 'nowAddress', dataIndex: 'nowAddress',
width: '220px' width: '220px'
}, },
{ {
title: '发放医生', title: '发放医生',
dataIndex: 'provideDoctorName', dataIndex: 'provideDoctorName',
width:'180px' width: '180px'
}, },
{ {
title: '类型', title: '类型',
dataIndex: 'sourceName', dataIndex: 'sourceName',
width:'140px' width: '140px'
}, },
{ {
title: '操作', title: '操作',
...@@ -180,7 +182,7 @@ ...@@ -180,7 +182,7 @@
showVisible: false, showVisible: false,
previewVisible: false, previewVisible: false,
consentUrl: "", consentUrl: "",
applySignUrl:"", applySignUrl: "",
consentInfo: "", consentInfo: "",
headers: { headers: {
Authorization: sessionStorage.getItem("token") Authorization: sessionStorage.getItem("token")
...@@ -207,7 +209,7 @@ ...@@ -207,7 +209,7 @@
getIdCardInfo() { getIdCardInfo() {
GetUserInfoByCardDevice().then(res => { GetUserInfoByCardDevice().then(res => {
let {cardno, name, address} = res; let {cardno, name, address} = res;
this.searchForm.womenIdCard = cardno this.searchForm.womenIdCard = cardno
}) })
}, },
searchList() { searchList() {
...@@ -253,18 +255,18 @@ ...@@ -253,18 +255,18 @@
// return window.parent.document.body // return window.parent.document.body
// }, // },
toAdd() { toAdd() {
let now_location = escape(process.env.VUE_APP_LOCATION+`folviteDistribution/add?menuId=${this.menuId}&menuCode=${this.routerParams.menuName}&routerFlag=add`) let now_location = escape(process.env.VUE_APP_LOCATION + `folviteDistribution/add?menuId=${this.menuId}&menuCode=${this.routerParams.menuName}&routerFlag=add`)
window.top.postMessage({messageType:'THIRD_PAGEADD',title:`发放登记`,url:now_location}, '*') window.top.postMessage({messageType: 'THIRD_PAGEADD', title: `发放登记`, url: now_location}, '*')
// this.$router.push({path: '/folviteDistribution/add', query: {routerFlag: 'add',menuId: this.menuId}}) this.$router.push({path: '/folviteDistribution/add', query: {routerFlag: 'add',menuId: this.menuId}})
}, },
toDetail(record) { toDetail(record) {
let now_location = escape(process.env.VUE_APP_LOCATION+`folviteDistribution/detail?menuId=${this.menuId}&menuCode=${this.routerParams.menuName}&id=${record.id}&source=${record.source}`) // let now_location = escape(process.env.VUE_APP_LOCATION + `folviteDistribution/detail?menuId=${this.menuId}&menuCode=${this.routerParams.menuName}&id=${record.id}&source=${record.source}`)
window.top.postMessage({messageType:'THIRD_PAGEADD',title:`查看详情`,url:now_location}, '*') // window.top.postMessage({messageType: 'THIRD_PAGEADD', title: `查看详情`, url: now_location}, '*')
// let par = { let par = {
// menuId: this.menuId, menuId: this.menuId,
// ...record ...record
// } }
// this.$router.push({path: '/folviteDistribution/detail', query: par}) this.$router.push({path: '/folviteDistribution/detail', query: par})
}, },
uploadConsentInfo(row) { uploadConsentInfo(row) {
this.formData.id = row.id; this.formData.id = row.id;
...@@ -308,6 +310,10 @@ ...@@ -308,6 +310,10 @@
window.open(val.response.data.trueDownloadUrl) window.open(val.response.data.trueDownloadUrl)
}, },
onsubmit() { onsubmit() {
if (this.currentRow.source == 1) {
this.visible = false;
return;
}
if (this.$api.utils.isBlank(this.formData.consentId)) { if (this.$api.utils.isBlank(this.formData.consentId)) {
this.$message.warning('请上传文件'); this.$message.warning('请上传文件');
return; return;
......
vue.config.js
View file @ 95fc1bde
...@@ -59,7 +59,7 @@ module.exports = { ...@@ -59,7 +59,7 @@ module.exports = {
warning: false, warning: false,
errors: false errors: false
}, },
https:true, https:false,
}, },
chainWebpack: (config) => { chainWebpack: (config) => {
config.plugins.delete('preload') config.plugins.delete('preload')
......
yarn.lock
View file @ 95fc1bde
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