Skip to content

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

需求2.1.1

parent 104f548c
master dev
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing with 109 additions and 22 deletions
.env.dev
View file @ 6d13f0d7
NODE_ENV = dev NODE_ENV = dev
VUE_APP_BASE_URL22 = https://beta-ysservice.yiboshi.com VUE_APP_BASE_URL2222 = 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_URL = http://127.0.0.1:8083 VUE_APP_BASE_URL = http://127.0.0.1:8083
......
package.json
View file @ 6d13f0d7
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
"core-js": "^3.6.5", "core-js": "^3.6.5",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
"http-parser-js": "^0.5.3", "http-parser-js": "^0.5.3",
"install": "^0.13.0",
"js-base64": "^3.7.2", "js-base64": "^3.7.2",
"js-md5": "^0.7.3", "js-md5": "^0.7.3",
"jsonp": "^0.2.1", "jsonp": "^0.2.1",
...@@ -23,7 +24,9 @@ ...@@ -23,7 +24,9 @@
"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",
"qrcode": "^1.5.0",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-print-nb": "^1.7.5",
"vue-qr": "^2.3.0", "vue-qr": "^2.3.0",
"vue-router": "^3.2.0", "vue-router": "^3.2.0",
"vue-ueditor-wrap": "^2.4.4", "vue-ueditor-wrap": "^2.4.4",
......
src/main.js
View file @ 6d13f0d7
...@@ -11,6 +11,7 @@ import 'ant-design-vue/dist/antd.less' ...@@ -11,6 +11,7 @@ import 'ant-design-vue/dist/antd.less'
// import '../static/css/global.less' // import '../static/css/global.less'
// // 引入nprogress进度条 // // 引入nprogress进度条
// import 'nprogress/nprogress.css' // import 'nprogress/nprogress.css'
import Print from 'vue-print-nb'
import './antd/register' import './antd/register'
import api from './api' import api from './api'
// import {optionalChaining} from "./views/utils/common"; // import {optionalChaining} from "./views/utils/common";
...@@ -32,7 +33,7 @@ Vue.filter('formatDate', function(value) {// 定义全局时间戳过滤器 ...@@ -32,7 +33,7 @@ Vue.filter('formatDate', function(value) {// 定义全局时间戳过滤器
return Moment(value).format('YYYY-MM-DD') return Moment(value).format('YYYY-MM-DD')
}) })
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.use(Print)
new Vue({ new Vue({
router, router,
store, store,
......
src/views/indexComponent/folviteApply/folviteApply.vue
View file @ 6d13f0d7
...@@ -88,11 +88,11 @@ const columns = [ ...@@ -88,11 +88,11 @@ const columns = [
// dataIndex: 'menCertificateTypeName', // dataIndex: 'menCertificateTypeName',
// width: '140px' // width: '140px'
// }, // },
// { {
// title: '证件号码', title: '申领数量',
// width: '220px', width: '100px',
// dataIndex: 'menIdCard' dataIndex: 'provideNumber'
// }, },
{ {
title: '联系电话', title: '联系电话',
dataIndex: 'telephone', dataIndex: 'telephone',
......
src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue
View file @ 6d13f0d7
...@@ -152,7 +152,8 @@ ...@@ -152,7 +152,8 @@
<a-form-model-item :wrapperCol="{span: 16}"> <a-form-model-item :wrapperCol="{span: 16}">
<div style="border: 1px dashed #EEEEEE;text-align: center"> <div style="border: 1px dashed #EEEEEE;text-align: center">
<div class="sign">签字</div> <div class="sign">签字</div>
<img style="height: 100px;margin-top: 20px;width: auto;transform: rotate(-90deg);" <img
style="height: 100px;margin-top: 20px;width: auto;transform: rotate(-90deg);"
:src="formData.applySignUrl"> :src="formData.applySignUrl">
</div> </div>
</a-form-model-item> </a-form-model-item>
...@@ -454,7 +455,7 @@ export default { ...@@ -454,7 +455,7 @@ export default {
this.spinning = true; this.spinning = true;
this.$api.folviteDistributionManage.fetchApplyDetail(this.routerParams.id).then(({data = [], code}) => { this.$api.folviteDistributionManage.fetchApplyDetail(this.routerParams.id).then(({data = [], code}) => {
this.formData = { this.formData = {
applyId:data.id, applyId: data.id,
height: data.height, height: data.height,
weight: data.weight, weight: data.weight,
birthDate: data.birthDate, birthDate: data.birthDate,
...@@ -471,11 +472,12 @@ export default { ...@@ -471,11 +472,12 @@ export default {
provideDate: moment(new Date()).format('yyyy-MM-DD'), provideDate: moment(new Date()).format('yyyy-MM-DD'),
remarks: data.remarks, remarks: data.remarks,
provideDoctorId: this.userInfo.relationId, provideDoctorId: this.userInfo.relationId,
recommendEat: '1颗/天(0.4mg/天)', recommendEat:data.recommendEat,
question: data.question
} }
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) : '-'; 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) { if (this.formData.question) {
this.formData.recommendEat = "2颗/天(0.8mg/天)"; this.checkedList = this.formData.question.split(",");
} }
this.changeWomenCardType() this.changeWomenCardType()
this.changeMenCardType() this.changeMenCardType()
...@@ -647,7 +649,7 @@ export default { ...@@ -647,7 +649,7 @@ export default {
} }
let provideDoctorInfo = vm.doctorInfoList.filter(item => item.id == provideDoctorId) let provideDoctorInfo = vm.doctorInfoList.filter(item => item.id == provideDoctorId)
params = { params = {
id:id, id: id,
parentDate: parentTime, parentDate: parentTime,
provideDate: provideTme, provideDate: provideTme,
presentCode: presentCodeInfo, presentCode: presentCodeInfo,
......
src/views/indexComponent/folviteDistribution/folviteDistribution.vue
View file @ 6d13f0d7
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
@click="restSearchForm">清空 @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="share">发放二维码</a-button>
<a-button type="primary" class="search_btn" style="float: right;margin-right: 20px" @click="toAdd">发放登记
</a-button>
<div style="clear: both"></div> <div style="clear: both"></div>
</a-form> </a-form>
<div style="margin-top: 16px;margin-bottom: 10px"></div> <div style="margin-top: 16px;margin-bottom: 10px"></div>
...@@ -38,9 +40,9 @@ ...@@ -38,9 +40,9 @@
<template slot="nowAddress" slot-scope="text, record"> <template slot="nowAddress" slot-scope="text, record">
<a-tooltip placement="top"> <a-tooltip placement="top">
<template slot="title"> <template slot="title">
<span> {{ (record.presentCodeName||"") + record.nowAddress }}</span> <span> {{ (record.presentCodeName || "") + record.nowAddress }}</span>
</template> </template>
<span class="ellipsis">{{ (record.presentCodeName||"") + record.nowAddress }}</span> <span class="ellipsis">{{ (record.presentCodeName || "") + record.nowAddress }}</span>
</a-tooltip> </a-tooltip>
</template> </template>
<template slot="action" slot-scope="record"> <template slot="action" slot-scope="record">
...@@ -130,9 +132,28 @@ ...@@ -130,9 +132,28 @@
@change="change" @change="change"
:showTotal="() => `共 ${pagination.total} 条`" :showTotal="() => `共 ${pagination.total} 条`"
/> />
<a-modal title="" :visible="qrCodeShow" @cancel="qrCodeShow = false" cancelText="关闭"
:footer="null"
loading="true"
:maskClosable="false"
width="600px">
<div ref="printContent" style="text-align: center;margin-top: 10%">
<h2>叶酸手机申请领取二维码(使用医站到家APP扫码领取)</h2>
<img width="80%" :src="qrCodeUrl" style="margin-left: 20px">
<br>
<center style="font-size:18px ">{{ unitInfo.unitName }}</center>
<br> <br>
</div>
<center @click="qrCodePrint" style="cursor: pointer">
<a-button>打印</a-button>
</center>
</a-modal>
</div> </div>
</template> </template>
<script> <script>
import QRCode from 'qrcode'
import {GetUserInfoByCardDevice, isEmptyParams} from "../../utils/common"; import {GetUserInfoByCardDevice, isEmptyParams} from "../../utils/common";
...@@ -227,7 +248,11 @@ export default { ...@@ -227,7 +248,11 @@ export default {
id: "" id: ""
}, },
currentRow: {}, currentRow: {},
menuId: undefined menuId: undefined,
qrCodeShow: false,
qrCodeUrl: "",
unitInfo: JSON.parse(window.sessionStorage.getItem('unitInfo')),
printDisplay: 'none'
} }
}, },
created() { created() {
...@@ -296,7 +321,7 @@ export default { ...@@ -296,7 +321,7 @@ export default {
if (process.env.NODE_ENV == "dev") { if (process.env.NODE_ENV == "dev") {
let par = { let par = {
menuId: this.menuId, menuId: this.menuId,
id:record.id id: record.id
} }
this.$router.push({path: '/folviteDistribution/detail', query: par}) this.$router.push({path: '/folviteDistribution/detail', query: par})
} else { } else {
...@@ -314,7 +339,11 @@ export default { ...@@ -314,7 +339,11 @@ export default {
this.$router.push({path: '/folviteDistribution/add', query: params}) this.$router.push({path: '/folviteDistribution/add', query: params})
} else { } else {
let now_location = escape(process.env.VUE_APP_LOCATION + `folviteDistribution/add?menuId=${this.menuId}&menuCode=${this.routerParams.menuName}&routerFlag=updateRecord&id=` + record.id) let now_location = escape(process.env.VUE_APP_LOCATION + `folviteDistribution/add?menuId=${this.menuId}&menuCode=${this.routerParams.menuName}&routerFlag=updateRecord&id=` + record.id)
window.top.postMessage({messageType: 'THIRD_PAGEADD', title: `叶酸发放登记修改-`+record.womanName, url: now_location}, '*') window.top.postMessage({
messageType: 'THIRD_PAGEADD',
title: `叶酸发放登记修改-` + record.womanName,
url: now_location
}, '*')
} }
}, },
deleteRecord(record) { deleteRecord(record) {
...@@ -412,11 +441,25 @@ export default { ...@@ -412,11 +441,25 @@ export default {
} }
}) })
},
share() {
this.qrCodeShow = true;
QRCode.toDataURL(this.unitInfo.id + "", {width: 500, height: 400, margin: 2})
.then(qrCodeUrl => {
this.qrCodeUrl = qrCodeUrl;
}).catch(err => {
// console.error(err);
});
},
qrCodePrint() {
this.printDisplay = 'block';
this.$print(this.$refs.printContent);
// window.print("<H1>HAHA</H1>");
} }
}, },
mounted() { mounted() {
let that=this; let that = this;
window.addEventListener("message",function (data){ window.addEventListener("message", function (data) {
that.getDataList(); that.getDataList();
}); });
} }
...@@ -451,6 +494,7 @@ export default { ...@@ -451,6 +494,7 @@ export default {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
} }
///deep/ .ant-table-tbody{ ///deep/ .ant-table-tbody{
// > tr:hover:not(.ant-table-expanded-row) > td,.ant-table-row-hover,.ant-table-row-hover>td{ // > tr:hover:not(.ant-table-expanded-row) > td,.ant-table-row-hover,.ant-table-row-hover>td{
// background:darkcyan !important; // background:darkcyan !important;
......
yarn.lock
View file @ 6d13f0d7
...@@ -3226,6 +3226,11 @@ diffie-hellman@^5.0.0: ...@@ -3226,6 +3226,11 @@ diffie-hellman@^5.0.0:
miller-rabin "^4.0.0" miller-rabin "^4.0.0"
randombytes "^2.0.0" randombytes "^2.0.0"
dijkstrajs@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.2.tgz#2e48c0d3b825462afe75ab4ad5e829c8ece36257"
integrity sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg==
dir-glob@^2.0.0, dir-glob@^2.2.2: dir-glob@^2.0.0, dir-glob@^2.2.2:
version "2.2.2" version "2.2.2"
resolved "https://registry.npm.taobao.org/dir-glob/download/dir-glob-2.2.2.tgz" resolved "https://registry.npm.taobao.org/dir-glob/download/dir-glob-2.2.2.tgz"
...@@ -3421,6 +3426,11 @@ emojis-list@^3.0.0: ...@@ -3421,6 +3426,11 @@ emojis-list@^3.0.0:
resolved "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz" resolved "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz"
integrity sha1-VXBmIEatKeLpFucariYKvf9Pang= integrity sha1-VXBmIEatKeLpFucariYKvf9Pang=
encode-utf8@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
encodeurl@~1.0.2: encodeurl@~1.0.2:
version "1.0.2" version "1.0.2"
resolved "https://registry.npm.taobao.org/encodeurl/download/encodeurl-1.0.2.tgz" resolved "https://registry.npm.taobao.org/encodeurl/download/encodeurl-1.0.2.tgz"
...@@ -4462,6 +4472,11 @@ inherits@2.0.3: ...@@ -4462,6 +4472,11 @@ inherits@2.0.3:
resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
install@^0.13.0:
version "0.13.0"
resolved "https://registry.yarnpkg.com/install/-/install-0.13.0.tgz#6af6e9da9dd0987de2ab420f78e60d9c17260776"
integrity sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA==
internal-ip@^4.3.0: internal-ip@^4.3.0:
version "4.3.0" version "4.3.0"
resolved "https://registry.npm.taobao.org/internal-ip/download/internal-ip-4.3.0.tgz" resolved "https://registry.npm.taobao.org/internal-ip/download/internal-ip-4.3.0.tgz"
...@@ -6095,6 +6110,11 @@ pkg-dir@^4.1.0: ...@@ -6095,6 +6110,11 @@ pkg-dir@^4.1.0:
dependencies: dependencies:
find-up "^4.0.0" find-up "^4.0.0"
pngjs@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb"
integrity sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==
pnp-webpack-plugin@^1.6.4: pnp-webpack-plugin@^1.6.4:
version "1.6.4" version "1.6.4"
resolved "https://registry.npm.taobao.org/pnp-webpack-plugin/download/pnp-webpack-plugin-1.6.4.tgz" resolved "https://registry.npm.taobao.org/pnp-webpack-plugin/download/pnp-webpack-plugin-1.6.4.tgz"
...@@ -6569,6 +6589,16 @@ q@^1.1.2: ...@@ -6569,6 +6589,16 @@ q@^1.1.2:
resolved "https://registry.npm.taobao.org/q/download/q-1.5.1.tgz" resolved "https://registry.npm.taobao.org/q/download/q-1.5.1.tgz"
integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
qrcode@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.0.tgz#95abb8a91fdafd86f8190f2836abbfc500c72d1b"
integrity sha512-9MgRpgVc+/+47dFvQeD6U2s0Z92EsKzcHogtum4QB+UNd025WOJSHvn/hjk9xmzj7Stj95CyUAs31mrjxliEsQ==
dependencies:
dijkstrajs "^1.0.1"
encode-utf8 "^1.0.3"
pngjs "^5.0.0"
yargs "^15.3.1"
qs@6.7.0: qs@6.7.0:
version "6.7.0" version "6.7.0"
resolved "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz" resolved "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz"
...@@ -8025,6 +8055,13 @@ vue-loader@^15.9.2: ...@@ -8025,6 +8055,13 @@ vue-loader@^15.9.2:
vue-hot-reload-api "^2.3.0" vue-hot-reload-api "^2.3.0"
vue-style-loader "^4.1.0" vue-style-loader "^4.1.0"
vue-print-nb@^1.7.5:
version "1.7.5"
resolved "https://registry.yarnpkg.com/vue-print-nb/-/vue-print-nb-1.7.5.tgz#0eaaf9317c233028458e8dbe8aa76603fef63b95"
integrity sha512-iNbNyUVRWz0Ha1UTiCKxMPtHLUDGgNI8e8xmD3xqm9RlXIUeX9bT7DgNAfY8vPzqyFRHqGjxLI1rycKH366ziQ==
dependencies:
vue "^2.6.11"
vue-qr@^2.3.0: vue-qr@^2.3.0:
version "2.3.0" version "2.3.0"
resolved "https://registry.npmjs.org/vue-qr/-/vue-qr-2.3.0.tgz" resolved "https://registry.npmjs.org/vue-qr/-/vue-qr-2.3.0.tgz"
...@@ -8369,7 +8406,7 @@ yargs@^13.3.2: ...@@ -8369,7 +8406,7 @@ yargs@^13.3.2:
y18n "^4.0.0" y18n "^4.0.0"
yargs-parser "^13.1.2" yargs-parser "^13.1.2"
yargs@^15.0.0: yargs@^15.0.0, yargs@^15.3.1:
version "15.4.1" version "15.4.1"
resolved "https://registry.npm.taobao.org/yargs/download/yargs-15.4.1.tgz?cache=0&sync_timestamp=1594421190657&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-15.4.1.tgz" resolved "https://registry.npm.taobao.org/yargs/download/yargs-15.4.1.tgz?cache=0&sync_timestamp=1594421190657&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-15.4.1.tgz"
integrity sha1-DYehbeAa7p2L7Cv7909nhRcw9Pg= integrity sha1-DYehbeAa7p2L7Cv7909nhRcw9Pg=
......
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