Skip to content

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

打包部署

parent 1fdf6d67
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 95 deletions
.env.dev
View file @ 57789e22
...@@ -2,7 +2,7 @@ NODE_ENV = dev ...@@ -2,7 +2,7 @@ NODE_ENV = dev
VUE_APP_BASE_URL3 = https://beta-ysservice.yiboshi.com VUE_APP_BASE_URL3 = 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_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
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'
......
.env.yueyang
View file @ 57789e22
NODE_ENV = yueyang NODE_ENV = yueyang
VUE_APP_BASE_URL1 = https://yyyesuan-service.yyjtzc.com VUE_APP_BASE_URL1 = https://yyyesuan-service.yyjtzc.com
VUE_APP_BASE_URL = http://59.230.237.90:8115 VUE_APP_BASE_URL = http://59.230.237.90:8115
VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com VUE_APP_BASE_PATH = http://59.230.237.90:8110
VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B' VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'
folacin-front.zip
View file @ 57789e22
No preview for this file type
package-lock.json
View file @ 57789e22
...@@ -8,11 +8,14 @@ ...@@ -8,11 +8,14 @@
"name": "folvite-distribution-front", "name": "folvite-distribution-front",
"version": "0.1.0", "version": "0.1.0",
"dependencies": { "dependencies": {
"ant-design-vue": "^1.7.8", "ant-design-vue": "^1.6.4",
"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.1.1",
"http-parser-js": "^0.5.3", "http-parser-js": "^0.5.3",
"js-base64": "^3.7.2",
"js-md5": "^0.7.3",
"jsonp": "^0.2.1", "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",
...@@ -5528,6 +5531,11 @@ ...@@ -5528,6 +5531,11 @@
"node": "*" "node": "*"
} }
}, },
"node_modules/crypto-js": {
"version": "4.1.1",
"resolved": "https://registry.npmmirror.com/crypto-js/download/crypto-js-4.1.1.tgz",
"integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
},
"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",
...@@ -8565,6 +8573,16 @@ ...@@ -8565,6 +8573,16 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/js-base64": {
"version": "3.7.2",
"resolved": "https://registry.npmmirror.com/js-base64/download/js-base64-3.7.2.tgz",
"integrity": "sha1-gW0R2BqK/yQWA9Gc5XYeE+Qdd0U="
},
"node_modules/js-md5": {
"version": "0.7.3",
"resolved": "https://registry.npm.taobao.org/js-md5/download/js-md5-0.7.3.tgz",
"integrity": "sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I="
},
"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",
...@@ -19046,6 +19064,11 @@ ...@@ -19046,6 +19064,11 @@
"randomfill": "^1.0.3" "randomfill": "^1.0.3"
} }
}, },
"crypto-js": {
"version": "4.1.1",
"resolved": "https://registry.npmmirror.com/crypto-js/download/crypto-js-4.1.1.tgz",
"integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
},
"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",
...@@ -21542,6 +21565,16 @@ ...@@ -21542,6 +21565,16 @@
} }
} }
}, },
"js-base64": {
"version": "3.7.2",
"resolved": "https://registry.npmmirror.com/js-base64/download/js-base64-3.7.2.tgz",
"integrity": "sha1-gW0R2BqK/yQWA9Gc5XYeE+Qdd0U="
},
"js-md5": {
"version": "0.7.3",
"resolved": "https://registry.npm.taobao.org/js-md5/download/js-md5-0.7.3.tgz",
"integrity": "sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I="
},
"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",
......
package.json
View file @ 57789e22
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
"private": true, "private": true,
"scripts": { "scripts": {
"serve-dev": "vue-cli-service serve --mode dev", "serve-dev": "vue-cli-service serve --mode dev",
"serve-yy": "vue-cli-service serve --mode yueyang",
"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"
...@@ -16,6 +17,7 @@ ...@@ -16,6 +17,7 @@
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
"http-parser-js": "^0.5.3", "http-parser-js": "^0.5.3",
"js-base64": "^3.7.2", "js-base64": "^3.7.2",
"js-md5": "^0.7.3",
"jsonp": "^0.2.1", "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",
......
public/index.html
View file @ 57789e22
...@@ -11,9 +11,6 @@ ...@@ -11,9 +11,6 @@
<!--<script src="https://webapi.amap.com/maps?v=1.4.4&key=34bb7ed1b21bfcc5a3ed0b9a66a587ff"></script>--> <!--<script src="https://webapi.amap.com/maps?v=1.4.4&key=34bb7ed1b21bfcc5a3ed0b9a66a587ff"></script>-->
<!-- <script src="https://libs.baidu.com/jquery/2.1.4/jquery.min.js"></script>--> <!-- <script src="https://libs.baidu.com/jquery/2.1.4/jquery.min.js"></script>-->
<script src="https://cdn.bootcss.com/html2canvas/0.5.0-beta4/html2canvas.js"></script> <script src="https://cdn.bootcss.com/html2canvas/0.5.0-beta4/html2canvas.js"></script>
</head> </head>
<body> <body>
<noscript> <noscript>
......
src/router/index.js
View file @ 57789e22
...@@ -4,55 +4,55 @@ import storeInfo from '../store/index' ...@@ -4,55 +4,55 @@ import storeInfo from '../store/index'
// 进度条 // 进度条
import NProgress from 'nprogress' import NProgress from 'nprogress';
let activeUrl = window.sessionStorage.getItem('activeItem') || '/Home/inStock' let activeUrl = window.sessionStorage.getItem('activeItem') || '/Home/inStock';
NProgress.configure({showSpinner: false}); NProgress.configure({showSpinner: false});
Vue.use(VueRouter) Vue.use(VueRouter)
const routes = [ const routes = [
{path: '/', redirect: activeUrl}, {path: '/', redirect: activeUrl},
{path: '/Login', component: () => import('@/views/Login.vue')}, {path: '/Login', component: () => import('../views/Login.vue')},
{path: '/unitLogin', component: () => import('@/views/Login.vue')}, {path: '/unitLogin', component: () => import('../views/Login.vue')},
{ {
path: '/Home', path: '/Home',
component: () => import('@/views/Home.vue'), component: () => import('../views/Home.vue'),
children: [ children: [
// 叶酸发放 // 叶酸发放
{path: 'folviteIndex', name: '首页', component: () => import('@/views/Index.vue')}, {path: 'folviteIndex', name: '首页', component: () => import('../views/Index.vue')},
//在库管理 //在库管理
{path: 'inStock', name: '在库管理', component: () => import('@/views/indexComponent/inStockManage/inStockManage.vue')}, {path: 'inStock', name: '在库管理', component: () => import('../views/indexComponent/inStockManage/inStockManage.vue')},
//叶酸发放登记 //叶酸发放登记
{path: 'folviteDistribution', name: '叶酸发放登记列表', component: () => import('@/views/indexComponent/folviteDistribution/folviteDistribution.vue')}, {path: 'folviteDistribution', name: '叶酸发放登记列表', component: () => import('../views/indexComponent/folviteDistribution/folviteDistribution.vue')},
//分配入库 //分配入库
{path: 'distributionWarehousing', name: '分配入库列表', component: () => import('@/views/indexComponent/distributionWarehousing/distributionWarehousing.vue')}, {path: 'distributionWarehousing', name: '分配入库列表', component: () => import('../views/indexComponent/distributionWarehousing/distributionWarehousing.vue')},
//发货方分配记录 //发货方分配记录
{path: 'sendRecord', name: '发货方分配记录', component: () => import('@/views/indexComponent/distributionWarehousing/sendRecord.vue')}, {path: 'sendRecord', name: '发货方分配记录', component: () => import('../views/indexComponent/distributionWarehousing/sendRecord.vue')},
//出入库记录 //出入库记录
{path: 'stockTransfer', name: '出入库记录', component: () => import('@/views/indexComponent/stockTransfer/stockTransfer.vue')}, {path: 'stockTransfer', name: '出入库记录', component: () => import('../views/indexComponent/stockTransfer/stockTransfer.vue')},
//叶酸申请管理 //叶酸申请管理
{path: 'folviteApply', name: '叶酸申请管理', component: () => import('@/views/indexComponent/folviteApply/folviteApply.vue')}, {path: 'folviteApply', name: '叶酸申请管理', component: () => import('../views/indexComponent/folviteApply/folviteApply.vue')},
//知情同意书管理 //知情同意书管理
{path: 'InformedConsent', name: '知情同意书', component: () => import('@/views/indexComponent/InformedConsent/InformedConsent.vue')}, {path: 'InformedConsent', name: '知情同意书', component: () => import('../views/indexComponent/InformedConsent/InformedConsent.vue')},
//供应商管理 //供应商管理
{path: 'supplyManage', name: '供应商管理', component: () => import('@/views/indexComponent/supplyManage/supplyManage.vue')}, {path: 'supplyManage', name: '供应商管理', component: () => import('../views/indexComponent/supplyManage/supplyManage.vue')},
], ],
}, },
//在库管理 //在库管理
{path: '/inStock/add', name: '库存录入', secondFlag: true,component: () => import('@/views/indexComponent/inStockManage/components/addStock.vue')}, {path: '/inStock/add', name: '库存录入', secondFlag: true,component: () => import('../views/indexComponent/inStockManage/components/addStock.vue')},
{path: '/inStock/addMaterialDistribution', name: '调拨分配', component: () => import('@/views/indexComponent/inStockManage/components/addMaterialDistribution.vue')}, {path: '/inStock/addMaterialDistribution', name: '调拨分配', component: () => import('../views/indexComponent/inStockManage/components/addMaterialDistribution.vue')},
{path: '/inStock/inStockManageDetail', name: '在库详情', component: () => import('@/views/indexComponent/inStockManage/components/inStockManageDetail.vue')}, {path: '/inStock/inStockManageDetail', name: '在库详情', component: () => import('../views/indexComponent/inStockManage/components/inStockManageDetail.vue')},
//叶酸发放登记 //叶酸发放登记
{path: '/folviteDistribution/add', name: '叶酸发放登记', component: () => import('@/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue')}, {path: '/folviteDistribution/add', name: '叶酸发放登记', component: () => import('../views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue')},
{path: '/folviteDistribution/detail', name: '叶酸发放详情', component: () => import('@/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue')}, {path: '/folviteDistribution/detail', name: '叶酸发放详情', component: () => import('../views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue')},
//分配入库 //分配入库
{path: '/distributionWarehousing/add', name: '分配入库', component: () => import('@/views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue')}, {path: '/distributionWarehousing/add', name: '分配入库', component: () => import('../views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue')},
{path: '/distributionWarehousing/detail', name: '分配入库详情', component: () => import('@/views/indexComponent/distributionWarehousing/components/distributionWarehousingDetail.vue')}, {path: '/distributionWarehousing/detail', name: '分配入库详情', component: () => import('../views/indexComponent/distributionWarehousing/components/distributionWarehousingDetail.vue')},
//叶酸申请管理 //叶酸申请管理
{path: '/folviteApply/grant', name: '叶酸申请发放', component: () => import('@/views/indexComponent/folviteApply/components/folviteApplyGrant.vue')}, {path: '/folviteApply/grant', name: '叶酸申请发放', component: () => import('../views/indexComponent/folviteApply/components/folviteApplyGrant.vue')},
//供应商管理 //供应商管理
{path: '/supplyManage/add', name: '新增供应商', component: () => import('@/views/indexComponent/supplyManage/components/addSupply.vue')}, {path: '/supplyManage/add', name: '新增供应商', component: () => import('../views/indexComponent/supplyManage/components/addSupply.vue')},
] ]
const router = new VueRouter({ const router = new VueRouter({
......
src/views/Home.vue
View file @ 57789e22
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
}, },
created() { created() {
//获取妇幼权限和登录基本信息 //获取妇幼权限和登录基本信息
//document.cookie = 'bGNnd3lwdF9hdA=3168e52c-71ce-4218-9813-4df7dc4c2371;' //document.cookie = 'bGNnd3lwdF9hdA=6a84c8f3-86b3-42dc-835c-95e8b26ce568;'
let cookieToken = getCookie('bGNnd3lwdF9hdA'); let cookieToken = getCookie('bGNnd3lwdF9hdA');
console.log('tokenInfo',cookieToken) console.log('tokenInfo',cookieToken)
if (cookieToken) {//根据cookie获取token并调用接口获取菜单并设置初始选中菜单 if (cookieToken) {//根据cookie获取token并调用接口获取菜单并设置初始选中菜单
......
src/views/Login.vue
View file @ 57789e22
...@@ -8,14 +8,14 @@ ...@@ -8,14 +8,14 @@
</div> </div>
<a-form-model :model="formData" :rules="formRules" class="login_form" ref="formRef"> <a-form-model :model="formData" :rules="formRules" class="login_form" ref="formRef">
<a-form-model-item prop="username"> <a-form-model-item prop="username">
<!-- <a-input placeholder="请输入用户名" v-model="formData.username" size="large" @keyup.enter="login">--> <a-input placeholder="请输入用户名" v-model="formData.username" size="large" @keyup.enter="login">
<!-- <a-icon slot="prefix" type="user"/>--> <a-icon slot="prefix" type="user"/>
<!-- </a-input>--> </a-input>
<a-select v-model="formData.username" size="large" @change="userChange"> <!-- <a-select v-model="formData.username" size="large" @change="userChange">-->
<a-select-option v-for="(i,index) in userList" :key="i.userName" :value="index"> <!-- <a-select-option v-for="(i,index) in userList" :key="i.userName" :value="index">-->
{{ i.unitName + "(" + i.userName + ")" }} <!-- {{ i.unitName + "(" + i.userName + ")" }}-->
</a-select-option> <!-- </a-select-option>-->
</a-select> <!-- </a-select>-->
</a-form-model-item> </a-form-model-item>
<a-form-model-item prop="password"> <a-form-model-item prop="password">
<a-input-password placeholder="请输入密码" v-model="formData.password" size="large" <a-input-password placeholder="请输入密码" v-model="formData.password" size="large"
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<script> <script>
import Verify from "@/views/components/verifition/Verify"; import Verify from "@/views/components/verifition/Verify";
import {singleLogin, aesEncrypt} from "./utils/loginApi"; import {singleLogin, aesEncrypt} from "./utils/loginApi";
import md5 from 'js-md5';
export default { export default {
components: {Verify}, components: {Verify},
...@@ -67,20 +68,10 @@ export default { ...@@ -67,20 +68,10 @@ export default {
} }
}, },
created() { created() {
let unitNames = ["云南省妇幼保健院", "云南省妇幼保健院（供应商管理)", "昆明市妇幼保健院", "五华区妇幼保健院", "五华区普吉大普吉社区卫生服务中心",
"五华区普吉新村社区卫生服务站", "五华区普吉林家院社区卫生服务站", "五华区大观社区卫生服务中心", "五华区护国南通街社区卫生服务站",
"五华区大观新闻里社区卫生服务中心", "医博士妇幼保健院"];
let userNames = ["3163915418", "3104754897", "3458022605", "4040050358", "0892676849", "7381485204", "4681975615", -
"0580382354", "2409311755", "7531945226", "330781198509074950"];
let passwords = ["ynfy2021", "075546", "078730", "073657", "07473X", "072179", "074991", "076479", "079813", "076831", "ybs1234"];
unitNames.forEach((x, index) => {
this.userList.push({unitName: x, userName: userNames[index], password: passwords[index]});
})
}, },
methods: { methods: {
userChange(value) { userChange(value) {
this.formData.username = this.userList[value].userName; this.formData.password = "YNybs2021?";
this.formData.password = this.userList[value].password;
}, },
login() { login() {
this.loading = true; this.loading = true;
...@@ -93,8 +84,8 @@ export default { ...@@ -93,8 +84,8 @@ export default {
); );
singleLogin(fromData).then(res => { singleLogin(fromData).then(res => {
if (res.data.code === "SUCCESS") { if (res.data.code === "SUCCESS") {
document.cookie = 'bGNnd3lwdF9hdA=' + res.data.data.token + ';' document.cookie = 'bGNnd3lwdF9hdA=' + res.data.data.token + ';';
sessionStorage.setItem("systemType",1); sessionStorage.setItem("systemType", 1);
this.$router.push('/Home/inStock'); this.$router.push('/Home/inStock');
this.$message.success(res.data.msg) this.$message.success(res.data.msg)
} else { } else {
......
src/views/indexComponent/folviteApply/folviteApply.vue
View file @ 57789e22
...@@ -73,21 +73,21 @@ ...@@ -73,21 +73,21 @@
width: '220px', width: '220px',
dataIndex: 'womenIdCard', dataIndex: 'womenIdCard',
}, },
{ // {
title: '男方姓名', // title: '男方姓名',
dataIndex: 'manName', // dataIndex: 'manName',
width: '140px' // width: '140px'
}, // },
{ // {
title: '证件类型', // title: '证件类型',
dataIndex: 'menCertificateTypeName', // dataIndex: 'menCertificateTypeName',
width: '140px' // width: '140px'
}, // },
{ // {
title: '证件号码', // title: '证件号码',
width: '220px', // width: '220px',
dataIndex: 'menIdCard' // dataIndex: 'menIdCard'
}, // },
{ {
title: '联系电话', title: '联系电话',
dataIndex: 'telephone', dataIndex: 'telephone',
...@@ -226,14 +226,14 @@ ...@@ -226,14 +226,14 @@
}); });
}, },
toDetail(record) { toDetail(record) {
let now_location = escape(process.env.VUE_APP_LOCATION+`folviteDistribution/add?menuId=${this.menuId}&menuCode=${this.routerParams.menuName}&routerFlag=update`) let now_location = escape(process.env.VUE_APP_LOCATION+`folviteDistribution/add?menuId=${this.menuId}&menuCode=${this.routerParams.menuName}&routerFlag=update`)
window.top.postMessage({messageType:'THIRD_PAGEADD',title:`叶酸申请`,url:now_location}, '*') window.top.postMessage({messageType:'THIRD_PAGEADD',title:`叶酸申请`,url:now_location}, '*')
// let params = { // let params = {
// id: record.id, // id: record.id,
// routerFlag: 'update', // routerFlag: 'update',
// menuId: this.menuId // menuId: this.menuId
// } // }
// this.$router.push({path: '/folviteDistribution/add', query: params}) // this.$router.push({path: '/folviteDistribution/add', query: params})
} }
}, },
} }
......
src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue
View file @ 57789e22
...@@ -49,7 +49,8 @@ ...@@ -49,7 +49,8 @@
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="出生日期" prop="birthDate"> <a-form-model-item label="出生日期" prop="birthDate">
<a-date-picker style="width: 100%" placeholder="请输入出生日期" format="YYYY-MM-DD" value-format="yyyy-MM-DD" <a-date-picker style="width: 100%" placeholder="请输入出生日期" format="YYYY-MM-DD"
value-format="yyyy-MM-DD"
v-model="formData.birthDate"/> v-model="formData.birthDate"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
...@@ -153,7 +154,7 @@ ...@@ -153,7 +154,7 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<p style="font-size: 20px;margin-top: 15%">建议服用：{{ formData.recommendEat }}颗/天</p> <p style="font-size: 20px;margin-top: 15%">建议服用：{{ formData.recommendEat }}</p>
</a-col> </a-col>
</a-row> </a-row>
</a-card> </a-card>
...@@ -208,7 +209,8 @@ ...@@ -208,7 +209,8 @@
</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" value-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>
...@@ -267,7 +269,8 @@ ...@@ -267,7 +269,8 @@
<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" value-format="yyyy-MM-DD" 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">
...@@ -384,13 +387,13 @@ export default { ...@@ -384,13 +387,13 @@ export default {
presentCode: undefined, presentCode: undefined,
nowAddress: unitInfo.unitAddress, nowAddress: unitInfo.unitAddress,
signedMode: '2', signedMode: '2',
parentDate:date, parentDate: date,
provideDate: date, provideDate: date,
provideDoctorId: userInfo.relationId, provideDoctorId: userInfo.relationId,
provideRecordList: [], provideRecordList: [],
remarks: undefined, remarks: undefined,
birthDate: "", birthDate: "",
recommendEat: 2, recommendEat: "2颗/天(0.8mg/天)",
question: "" question: ""
}, },
cardType, cardType,
...@@ -443,9 +446,9 @@ export default { ...@@ -443,9 +446,9 @@ export default {
{required: true, message: '请输入联系电话'}, {required: true, message: '请输入联系电话'},
{validator: checkPhone}, {validator: checkPhone},
], ],
presentCode: [ // presentCode: [
{required: true, message: '请选择选择现住地址'} // {required: true, message: '请选择选择现住地址'}
], // ],
nowAddress: [ nowAddress: [
{required: true, message: '请输入详细地址'} {required: true, message: '请输入详细地址'}
], ],
...@@ -524,13 +527,13 @@ export default { ...@@ -524,13 +527,13 @@ export default {
}, },
methods: { methods: {
onChange(checkedList) { onChange(checkedList) {
this.formData.recommendEat = 2; this.formData.recommendEat = "2颗/天(0.8mg/天)";
checkedList.forEach(x => { checkedList.forEach(x => {
if (x == '3') { if (x == '3') {
this.formData.recommendEat = 10; this.formData.recommendEat = "10颗/天(4mg/天)";
} }
if (x == '4') { if (x == '4') {
this.formData.recommendEat = 13; this.formData.recommendEat = "13颗/天(5.2mg/天)";
} }
}) })
}, },
...@@ -690,17 +693,25 @@ export default { ...@@ -690,17 +693,25 @@ export default {
questionList += x + ","; questionList += x + ",";
}) })
this.formData.question = questionList.substring(0, questionList.length - 1); this.formData.question = questionList.substring(0, questionList.length - 1);
} else {
this.$message.success('请选择问卷内容!');
return;
} }
this.spinning = true; this.spinning = true;
let params = {}; let params = {};
this.formData.provideRecordList.forEach(item => { // this.formData.provideRecordList.forEach(item => {
item.stockId = item.id // item.stockId = item.id
}); // });
const {parentDate, provideDate, presentCode, provideDoctorId, ...others} = vm.formData const {parentDate, provideDate, presentCode, provideDoctorId, ...others} = vm.formData
let parentTime = moment(parentDate).format('YYYY-MM-DD') let parentTime = moment(parentDate).format('YYYY-MM-DD')
let provideTme = moment(provideDate).format('YYYY-MM-DD') let provideTme = moment(provideDate).format('YYYY-MM-DD')
let presentCodeInfo = presentCode[presentCode.length - 1]; let presentCodeInfo = "";
if (presentCode != null && presentCode.length > 1) {
presentCodeInfo = presentCode[presentCode.length - 1];
} else {
presentCodeInfo = this.unitInfo.areaCode;
}
let provideDoctorInfo = vm.doctorInfoList.filter(item => item.id == provideDoctorId) let provideDoctorInfo = vm.doctorInfoList.filter(item => item.id == provideDoctorId)
params = { params = {
parentDate: parentTime, parentDate: parentTime,
......
src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue
View file @ 57789e22
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
{{detailInfo.provideDoctorName || '--'}} {{detailInfo.provideDoctorName || '--'}}
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="建议服用"> <a-descriptions-item label="建议服用">
{{detailInfo.recommendEat+"颗/天" || '--'}} {{detailInfo.recommendEat || '--'}}
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="备注"> <a-descriptions-item label="备注">
{{detailInfo.remarks || '--'}} {{detailInfo.remarks || '--'}}
......
src/views/indexComponent/inStockManage/inStockManage.vue
View file @ 57789e22
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
} }
this.searchList() this.searchList()
}, },
onSelectChange(selectedRowKeys) { selectChange(selectedRowKeys) {
this.selectedRowKeys = selectedRowKeys; this.selectedRowKeys = selectedRowKeys;
}, },
downLoadExcel() { downLoadExcel() {
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
openModal() { openModal() {
let now_location = escape(process.env.VUE_APP_LOCATION+`inStock/add?menuId=${this.menuId}&menuCode=${this.routerParams.menuName}`) let now_location = escape(process.env.VUE_APP_LOCATION+`inStock/add?menuId=${this.menuId}&menuCode=${this.routerParams.menuName}`)
window.top.postMessage({messageType:'THIRD_PAGEADD',title:`库存录入`,url:now_location}, '*') window.top.postMessage({messageType:'THIRD_PAGEADD',title:`库存录入`,url:now_location}, '*')
// let par = {menuId: this.menuId} let par = {menuId: this.menuId}
// this.$router.push({path: '/inStock/add', query: par}) // this.$router.push({path: '/inStock/add', query: par})
}, },
toAdd() { toAdd() {
......
src/views/utils/loginApi.js
View file @ 57789e22
...@@ -4,11 +4,10 @@ import axios from 'axios'; ...@@ -4,11 +4,10 @@ import axios from 'axios';
import {Base64} from "js-base64"; import {Base64} from "js-base64";
import CryptoJS from 'crypto-js' import CryptoJS from 'crypto-js'
let SIGN_HOST = "https://beta-yac.yiboshi.com";
let JQ_SECRET = "jq:jqsecret"; let JQ_SECRET = "jq:jqsecret";
let COOKIE = 'bGNnd3lwdF9hdA'; let COOKIE = 'bGNnd3lwdF9hdA';
const instance = axios.create({ const instance = axios.create({
baseURL: SIGN_HOST, baseURL: process.env.VUE_APP_BASE_PATH,
withCredentials: true, withCredentials: true,
timeout: 60000 timeout: 60000
}); });
......
yarn.lock
View file @ 57789e22
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