Skip to content

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

细节完善

parent ea172a4d
Show whitespace changes
Inline Side-by-side
Showing with 402 additions and 276 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/addFolviteDistribution.vue
View file @ 95fc1bde
...@@ -34,77 +34,126 @@ ...@@ -34,77 +34,126 @@
<a-select-option v-for="item in certificateTypeList" <a-select-option v-for="item in certificateTypeList"
:key="item.enumValue" :value="item.enumValue" :key="item.enumValue" :value="item.enumValue"
> >
{{item.enumName}} {{ item.enumName }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12" v-if="formData.womenCertificateType!=3">
<a-form-model-item label="证件号码" prop="womenIdCard"> <a-form-model-item label="证件号码" prop="womenIdCard">
<a-input placeholder="请输入证件号码" v-model="formData.womenIdCard" <a-input placeholder="请输入证件号码" @blur="womenIdCardChange"
v-model="formData.womenIdCard"
:disabled="disabled"></a-input> :disabled="disabled"></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="是否曾经怀孕" prop="oncePregnant"> <a-form-model-item label="出生日期" prop="birthDate">
<a-radio-group v-model="formData.oncePregnant" @change="onChangePregnant" <a-date-picker style="width: 100%" placeholder="请输入出生日期" format="YYYY-MM-DD" value-format="yyyy-MM-DD"
:disabled="disabled"> v-model="formData.birthDate"/>
<a-radio :value="1">
是
</a-radio>
<a-radio :value="2">
否
</a-radio>
</a-radio-group>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="孕次" prop="pregnantNum" v-if="formData.oncePregnant==1"> <a-form-model-item label="身高" prop="height">
<a-input v-toInt placeholder="请输入" v-model="formData.pregnantNum" <a-input type="number" placeholder="请输入体重,100-1000的整数"
:disabled="disabled"></a-input> v-model="formData.height" suffix="cm"
></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="体重" prop="weight">
<a-input placeholder="请输入体重,100-1000的整数"
v-model="formData.weight" suffix="kg"
></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="BMI" prop="bmi">
<a-input
:value="formData.weight/formData.height?(formData.weight/(formData.height/100)).toFixed(2):'-'"
disabled>1
</a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<!-- <a-col :span="12">-->
<!-- <a-form-model-item label="是否曾经怀孕" prop="oncePregnant">-->
<!-- <a-radio-group v-model="formData.oncePregnant" @change="onChangePregnant"-->
<!-- :disabled="disabled">-->
<!-- <a-radio :value="1">-->
<!-- 是-->
<!-- </a-radio>-->
<!-- <a-radio :value="2">-->
<!-- 否-->
<!-- </a-radio>-->
<!-- </a-radio-group>-->
<!-- </a-form-model-item>-->
<!-- </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"-->
<!-- :disabled="disabled"></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
</a-row> </a-row>
</a-card> </a-card>
<!-- <a-card size="small" :headStyle="{background: '#FAFAFA'}" style="margin-top: 16px">-->
<!-- <div slot="title">-->
<!-- <img class="title_img" src="../../../../../static/images/user_info_index.png">-->
<!-- <span class="title_font">男方信息</span>-->
<!-- </div>-->
<!-- <a-button slot="extra" class="ant-table-btn" @click="getMenIdCardInfo">身份证识别</a-button>-->
<!-- <a-row :gutter="16">-->
<!-- <a-col :span="12">-->
<!-- <a-form-model-item label="姓名" prop="manName">-->
<!-- <a-input-->
<!-- v-toInputNum="{num: 15}"-->
<!-- placeholder="请输入姓名，最多可输入15个字"-->
<!-- 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="请选择"-->
<!-- :disabled="disabled"-->
<!-- @change="changeMenCardType"-->
<!-- >-->
<!-- <a-select-option v-for="item in certificateTypeList"-->
<!-- :key="item.enumValue"-->
<!-- :value="item.enumValue"-->
<!-- >-->
<!-- {{item.enumName}}-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="12">-->
<!-- <a-form-model-item label="证件号码" prop="menIdCard">-->
<!-- <a-input placeholder="请输入证件号码" v-model="formData.menIdCard"-->
<!-- :disabled="disabled"></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- </a-row>-->
<!-- </a-card>-->
<a-card size="small" :headStyle="{background: '#FAFAFA'}" style="margin-top: 16px"> <a-card size="small" :headStyle="{background: '#FAFAFA'}" style="margin-top: 16px">
<div slot="title"> <div slot="title">
<img class="title_img" src="../../../../../static/images/user_info_index.png"> <img class="title_img" src="../../../../../static/images/user_info_index.png">
<span class="title_font">男方信息</span> <span class="title_font">问卷<p
style="font-size: 10px;display:inline;color: red;margin-left: 10px">请提示用户：如新鲜蔬果摄入少、血液叶酸水平低、备孕时间短，请酌情增补每日叶酸服用量。</p></span>
</div> </div>
<a-button slot="extra" class="ant-table-btn" @click="getMenIdCardInfo">身份证识别</a-button> <a-row :gutter="16" style="margin-left: 150px">
<a-row :gutter="16">
<a-col :span="12">
<a-form-model-item label="姓名" prop="manName">
<a-input
v-toInputNum="{num: 15}"
placeholder="请输入姓名，最多可输入15个字"
v-model="formData.manName"
:disabled="disabled"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="证件类型" prop="menCertificateType"> <a-form-model-item label="" prop="checkedList">
<a-select v-model="formData.menCertificateType" <a-checkbox-group style="width: 100%" v-model="checkedList" :options="plainOptions"
placeholder="请选择" @change="onChange"/>
:disabled="disabled"
@change="changeMenCardType"
>
<a-select-option v-for="item in certificateTypeList"
:key="item.enumValue"
:value="item.enumValue"
>
{{item.enumName}}
</a-select-option>
</a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="证件号码" prop="menIdCard"> <p style="font-size: 20px;margin-top: 15%">建议服用：{{ formData.recommendEat }}颗/天</p>
<a-input placeholder="请输入证件号码" v-model="formData.menIdCard"
:disabled="disabled"></a-input>
</a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
</a-card> </a-card>
...@@ -132,7 +181,7 @@ ...@@ -132,7 +181,7 @@
:options="areaInfo" :options="areaInfo"
:fieldNames="fieldNames" :fieldNames="fieldNames"
:load-data="loadAreaData" :load-data="loadAreaData"
placeholder="请选择"/> :placeholder="unitInfo.areaFullName"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
...@@ -152,14 +201,14 @@ ...@@ -152,14 +201,14 @@
<a-select-option v-for="item in signedModeList" <a-select-option v-for="item in signedModeList"
:key="item.enumValue" :value="item.enumValue" :key="item.enumValue" :value="item.enumValue"
> >
{{item.enumName}} {{ item.enumName }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="签署日期" prop="parentDate"> <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" value-format="yyyy-MM-DD"
:disabled="disabled" :disabled="disabled"
style="width: 100%"/> style="width: 100%"/>
</a-form-model-item> </a-form-model-item>
...@@ -218,7 +267,7 @@ ...@@ -218,7 +267,7 @@
<div style="clear: both"></div> <div style="clear: both"></div>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="发放日期" prop="provideDate"> <a-form-model-item label="发放日期" prop="provideDate">
<a-date-picker v-model="formData.provideDate" format="YYYY-MM-DD" style="width: 100%"/> <a-date-picker v-model="formData.provideDate" value-format="yyyy-MM-DD" format="YYYY-MM-DD" style="width: 100%"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
...@@ -227,55 +276,55 @@ ...@@ -227,55 +276,55 @@
<a-select-option v-for="item in doctorInfoList" <a-select-option v-for="item in doctorInfoList"
:key="item.id" :value="item.id" :key="item.id" :value="item.id"
> >
{{item.staffName}} {{ item.staffName }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="21" :offset="3"> <!-- <a-col :span="21" :offset="3">-->
<a-form-model-item :wrapperCol="{span: 23}"> <!-- <a-form-model-item :wrapperCol="{span: 23}">-->
<a-button type="primary" @click="openStockModel">请选择要发放的叶酸种类 <!-- <a-button type="primary" @click="openStockModel">请选择要发放的叶酸种类-->
</a-button> <!-- </a-button>-->
<a-table :dataSource="formData.provideRecordList" rowKey="id" :pagination="false" <!-- <a-table :dataSource="formData.provideRecordList" rowKey="id" :pagination="false"-->
class="table_input tab_error modal_table" <!-- class="table_input tab_error modal_table"-->
style="margin-top: 10px" <!-- style="margin-top: 10px"-->
bordered> <!-- bordered>-->
<a-table-column title="供应商名称" data-index="supplierName"></a-table-column> <!-- <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="brandName"></a-table-column>-->
<a-table-column title="批次号" data-index="batchNumber"></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="当前库存" data-index="number"></a-table-column>-->
<a-table-column title="发放数量" width="190px"> <!-- <a-table-column title="发放数量" width="190px">-->
<template slot-scope="text, record, index"> <!-- <template slot-scope="text, record, index">-->
<a-form-model-item :prop="'provideRecordList.' + index + '.sendNumber'" <!-- <a-form-model-item :prop="'provideRecordList.' + index + '.sendNumber'"-->
:rules="formRules.sendNumber" class="tab_input_r"> <!-- :rules="formRules.sendNumber" class="tab_input_r">-->
<a-input type="number" <!-- <a-input type="number"-->
v-toInt="{notNum: '0'}" <!-- v-toInt="{notNum: '0'}"-->
v-model="record.sendNumber" <!-- v-model="record.sendNumber"-->
placeholder="请输入发放数量" <!-- placeholder="请输入发放数量"-->
style="width: 150px;" <!-- style="width: 150px;"-->
@change="getChangeRecord(record)" <!-- @change="getChangeRecord(record)"-->
> <!-- >-->
</a-input> <!-- </a-input>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</template> <!-- </template>-->
</a-table-column> <!-- </a-table-column>-->
<a-table-column title="操作" align="center" width="70px"> <!-- <a-table-column title="操作" align="center" width="70px">-->
<template slot-scope="text, record, index"> <!-- <template slot-scope="text, record, index">-->
<!-- <a-button type="link" class="table_delbtn" @click="deleteGoodsList(index)">删除</a-button> --> <!-- &lt;!&ndash; <a-button type="link" class="table_delbtn" @click="deleteGoodsList(index)">删除</a-button> &ndash;&gt;-->
<a-popconfirm <!-- <a-popconfirm-->
title="确定移除该物资吗？" <!-- title="确定移除该物资吗？"-->
ok-text="是" <!-- ok-text="是"-->
cancel-text="否" <!-- cancel-text="否"-->
@confirm="confirm(index)" <!-- @confirm="confirm(index)"-->
> <!-- >-->
<a-button class="ant-table-btn" size="small">删除</a-button> <!-- <a-button class="ant-table-btn" size="small">删除</a-button>-->
</a-popconfirm> <!-- </a-popconfirm>-->
</template> <!-- </template>-->
</a-table-column> <!-- </a-table-column>-->
</a-table> <!-- </a-table>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="备注" prop="remarks" :labelCol="{span: 3}" :wrapperCol="{span: 20}"> <a-form-model-item label="备注" prop="remarks" :labelCol="{span: 3}" :wrapperCol="{span: 20}">
<a-textarea placeholder="请输入备注，最多可输入500字" v-model="formData.remarks" :rows="5" <a-textarea placeholder="请输入备注，最多可输入500字" v-model="formData.remarks" :rows="5"
...@@ -287,7 +336,7 @@ ...@@ -287,7 +336,7 @@
<!-- 选择叶酸种类弹框--> <!-- 选择叶酸种类弹框-->
<div> <div>
<in-stock-manage-info ref="inStockManageInfo" @selectedIdList="getChecked" <in-stock-manage-info ref="inStockManageInfo" @selectedIdList="getChecked"
v-if="readyGetChecked" :menuId="routerParams.menuId" ></in-stock-manage-info> v-if="readyGetChecked" :menuId="routerParams.menuId"></in-stock-manage-info>
</div> </div>
<div style="text-align: center;margin-top: 16px"> <div style="text-align: center;margin-top: 16px">
<a-button class="ant-table-btn" @click="goBack">取消</a-button> <a-button class="ant-table-btn" @click="goBack">取消</a-button>
...@@ -301,18 +350,25 @@ ...@@ -301,18 +350,25 @@
</template> </template>
<script> <script>
import {checkPhone, closedDetail, getEnumByFlag, GetUserInfoByCardDevice} from "../../../utils/common"; import {checkPhone, closedDetail, getEnumByFlag, GetUserInfoByCardDevice} from "../../../utils/common";
import {cardType} from "../../../utils/dropDownCollection"; import {cardType} from "../../../utils/dropDownCollection";
import moment from 'moment' import moment from 'moment'
import InStockManageInfo from "./inStockManageInfo"; import InStockManageInfo from "./inStockManageInfo";
let vm = this let vm = this
let recordInfo = {} let recordInfo = {}
export default { export default {
components: {InStockManageInfo}, components: {InStockManageInfo},
data() { data() {
let unitInfo = JSON.parse(window.sessionStorage.getItem('unitInfo'));
let userInfo = JSON.parse(window.sessionStorage.getItem('userInfo'));
let date = moment(new Date()).format('YYYY-MM-DD');
return { return {
unitInfo: JSON.parse(window.sessionStorage.getItem('networkInfo')), unitInfo: unitInfo,
indeterminate: true,
checkedList: [],
plainOptions: [],
checkAll: false,
spinning: false, spinning: false,
// 弹窗内表单 // 弹窗内表单
formData: { formData: {
...@@ -326,13 +382,16 @@ ...@@ -326,13 +382,16 @@
menIdCard: undefined, menIdCard: undefined,
telephone: undefined, telephone: undefined,
presentCode: undefined, presentCode: undefined,
nowAddress: undefined, nowAddress: unitInfo.unitAddress,
signedMode: '2', signedMode: '2',
parentDate: moment(new Date()).format('yyyy-MM-DD'), parentDate:date,
provideDate: moment(new Date()).format('yyyy-MM-DD'), provideDate: date,
provideDoctorId: undefined, provideDoctorId: userInfo.relationId,
provideRecordList: [], provideRecordList: [],
remarks: undefined, remarks: undefined,
birthDate: "",
recommendEat: 2,
question: ""
}, },
cardType, cardType,
disabled: false, disabled: false,
...@@ -347,9 +406,20 @@ ...@@ -347,9 +406,20 @@
{required: true, message: '请输入证件号码'}, {required: true, message: '请输入证件号码'},
{ {
pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
message:'请输入正确的身份证号' message: '请输入正确的身份证号'
} }
], ],
birthDate: [
{required: true, message: '请输入出生日期'}
],
height: [
{required: true, message: '请输入体重,100-1000的整数'},
{validator: this.checkHeightWeight},
],
weight: [
{required: true, message: '请输入体重,100-1000的整数'},
{validator: this.checkHeightWeight},
],
// oncePregnant: [ // oncePregnant: [
// {required: true, message: '请选择是否曾经怀孕'} // {required: true, message: '请选择是否曾经怀孕'}
// ], // ],
...@@ -366,7 +436,7 @@ ...@@ -366,7 +436,7 @@
{required: true, message: '请输入证件号码'}, {required: true, message: '请输入证件号码'},
{ {
pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
message:'请输入正确的身份证号' message: '请输入正确的身份证号'
} }
], ],
telephone: [ telephone: [
...@@ -438,6 +508,10 @@ ...@@ -438,6 +508,10 @@
this.routerParams = this.$route.query; this.routerParams = this.$route.query;
this.certificateTypeList = getEnumByFlag('folacin_resident_info_certificate_type') this.certificateTypeList = getEnumByFlag('folacin_resident_info_certificate_type')
this.signedModeList = getEnumByFlag('folacin_resident_info_signed_mode') this.signedModeList = getEnumByFlag('folacin_resident_info_signed_mode')
let questionEnum = getEnumByFlag('folacin_resident_info_question');
questionEnum.forEach(enums => {
this.plainOptions.push({label: enums.enumName, value: enums.enumValue});
});
this.getBookHtmlContent() this.getBookHtmlContent()
this.getAllDoctorList() this.getAllDoctorList()
this.initLoadAreaData() this.initLoadAreaData()
...@@ -449,6 +523,24 @@ ...@@ -449,6 +523,24 @@
} }
}, },
methods: { methods: {
onChange(checkedList) {
this.formData.recommendEat = 2;
checkedList.forEach(x => {
if (x == '3') {
this.formData.recommendEat = 10;
}
if (x == '4') {
this.formData.recommendEat = 13;
}
})
},
checkHeightWeight(rule, value, callback) {
if (value == null || value < 100 || value > 1000) {
callback(new Error('请输入体重,100-1000的整数'));
} else {
callback()
}
},
getStockListDetail() { getStockListDetail() {
this.spinning = true this.spinning = true
let par = { let par = {
...@@ -551,8 +643,6 @@ ...@@ -551,8 +643,6 @@
}, },
save() { save() {
const {isEmpty, data} = this.$refs.signaturePad.saveSignature(); const {isEmpty, data} = this.$refs.signaturePad.saveSignature();
// console.log(isEmpty);
// console.log(data);
}, },
getChecked(val) { getChecked(val) {
...@@ -594,9 +684,13 @@ ...@@ -594,9 +684,13 @@
let vm = this; let vm = this;
this.$refs.formRef.validate(valid => { this.$refs.formRef.validate(valid => {
if (valid) { if (valid) {
if (this.formData.provideRecordList.length === 0) { if (this.checkedList.length > 0) {
this.$message.warning('发放叶酸不能为空！'); let questionList = "";
} else { this.checkedList.forEach(x => {
questionList += x + ",";
})
this.formData.question = questionList.substring(0, questionList.length - 1);
}
this.spinning = true; this.spinning = true;
let params = {}; let params = {};
this.formData.provideRecordList.forEach(item => { this.formData.provideRecordList.forEach(item => {
...@@ -616,7 +710,7 @@ ...@@ -616,7 +710,7 @@
provideDoctorName: provideDoctorInfo[0].staffName, provideDoctorName: provideDoctorInfo[0].staffName,
...others ...others
} }
params.menuId= this.routerParams.menuId params.menuId = this.routerParams.menuId
if (this.routerParams.routerFlag == 'update') { if (this.routerParams.routerFlag == 'update') {
params.applyId = this.routerParams.id params.applyId = this.routerParams.id
this.$api.folviteApplyManage.addFolviteDistributionByApply(params).then(({code}) => { this.$api.folviteApplyManage.addFolviteDistributionByApply(params).then(({code}) => {
...@@ -640,7 +734,6 @@ ...@@ -640,7 +734,6 @@
}) })
} }
} }
}
}); });
}, },
onChangePregnant(e) { onChangePregnant(e) {
...@@ -651,6 +744,23 @@ ...@@ -651,6 +744,23 @@
this.womanPregnant = false this.womanPregnant = false
} }
}, },
womenIdCardChange() {
if (!this.formData.womenIdCard) {
return
}
let womenIdCard = this.formData.womenIdCard.trim();
this.formData.womenIdCard = womenIdCard;
if (this.formData.womenCertificateType == 1) {
let length = womenIdCard.length;
if (length == 15 | length == 18) {
let year = this.formData.womenIdCard.substring(6, 10);
let moth = this.formData.womenIdCard.substring(10, 12);
let day = this.formData.womenIdCard.substring(12, 14);
this.formData.birthDate = year + "-" + moth + "-" + day;
}
}
},
//打开库存弹框 //打开库存弹框
openStockModel() { openStockModel() {
this.readyGetChecked = true this.readyGetChecked = true
...@@ -661,70 +771,84 @@ ...@@ -661,70 +771,84 @@
}, },
goBack() { goBack() {
window.top.postMessage({messageType:'THIRD_PAGECHANGE',name:`${this.routerParams.menuCode}`,source:"yesuan"}, '*') // window.top.postMessage({
// if (this.routerParams.routerFlag == "update") { // messageType: 'THIRD_PAGECHANGE',
// this.$router.push("/Home/folviteApply"); // name: `${this.routerParams.menuCode}`,
// closedDetail('/inStock/addMaterialDistribution', '/Home/folviteApply'); // source: "yesuan"
// } else { // }, '*')
// this.$router.push("/Home/folviteDistribution"); if (this.routerParams.routerFlag == "update") {
// closedDetail('/inStock/addMaterialDistribution', '/Home/folviteDistribution') this.$router.push("/Home/folviteApply");
// } closedDetail('/inStock/addMaterialDistribution', '/Home/folviteApply');
} else {
this.$router.push("/Home/folviteDistribution");
closedDetail('/inStock/addMaterialDistribution', '/Home/folviteDistribution')
} }
} }
} }
}
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.title_img { .title_img {
display: inline-block; display: inline-block;
width: 24px; width: 24px;
height: 24px; height: 24px;
margin-top: -5px; margin-top: -5px;
margin-left: 20px; margin-left: 20px;
} }
.title_font { .title_font {
font-family: PingFang SC; font-family: PingFang SC;
color: #595959; color: #595959;
font-weight: 600; font-weight: 600;
font-size: 16px; font-size: 16px;
line-height: 22px; line-height: 22px;
margin: 16px 0px 16px 18px; margin: 16px 0px 16px 18px;
} }
</style> </style>
<style lang="less"> <style lang="less">
.book { .book {
.ant-card-head-title { .ant-card-head-title {
padding: 0px !important; padding: 0px !important;
} }
} }
.sign { .sign {
position: absolute; position: absolute;
background: #FFF1F0; background: #FFF1F0;
border-radius: 0px 0px 24px 0px; border-radius: 0px 0px 24px 0px;
width: 60px; width: 60px;
height: 40px; height: 40px;
padding: 0px 16px; padding: 0px 16px;
} }
.opt { .opt {
float: right; float: right;
margin-top: 10px; margin-top: 10px;
} }
.table_input { .table_input {
.ant-table-tbody > tr > td { .ant-table-tbody > tr > td {
padding: 5px !important; padding: 5px !important;
overflow-wrap: break-word; overflow-wrap: break-word;
} }
} }
.modal_table {
.modal_table {
.ant-form-item { .ant-form-item {
margin-bottom: 0px!important; margin-bottom: 0px !important;
}
} }
}
.ant-checkbox-group-item {
display: block;
margin-top: 20px;
}
.ant-checkbox-group {
width: 100%;
}
</style> </style>
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
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
<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,7 +86,8 @@ ...@@ -85,7 +86,8 @@
<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>
...@@ -119,7 +121,7 @@ ...@@ -119,7 +121,7 @@
{ {
title: '姓名', title: '姓名',
dataIndex: 'womanName', dataIndex: 'womanName',
width:'140px' width: '140px'
}, },
{ {
title: '证件号码', title: '证件号码',
...@@ -144,12 +146,12 @@ ...@@ -144,12 +146,12 @@
{ {
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")
...@@ -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 source diff could not be displayed because it is too large. You can view the blob instead.
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