Skip to content

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

Merge branch 'gcl' of http://gitlab.yiboshi.com/ynby/folacin-front into gcl

parents efa0acbb 2852ef35
Show whitespace changes
Inline Side-by-side
Showing with 172 additions and 81 deletions
.env.dev
View file @ 6250f541
NODE_ENV = dev
VUE_APP_BASE_URL1 = http://123.56.183.13:8083
VUE_APP_BASE_URL = http://127.0.0.1:8082
VUE_APP_BASE_URL = https://beta-ysservice.yiboshi.com
VUE_APP_BASE_URL1 = http://127.0.0.1:8082
VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'
.env.production
View file @ 6250f541
NODE_ENV = prod
VUE_APP_BASE_URL = http://123.56.183.13:8083
VUE_APP_BASE_URL = https://beta-ysservice.yiboshi.com
VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'
package.json
View file @ 6250f541
......@@ -12,18 +12,14 @@
"axios": "^0.19.2",
"compression-webpack-plugin": "5.0.0",
"core-js": "^3.6.5",
"crypto-js": "^4.0.0",
"http-parser-js": "^0.5.3",
"js-base64": "^3.6.1",
"moment": "^2.29.1",
"moment-locales-webpack-plugin": "^1.2.0",
"nprogress": "^0.2.0",
"print-js": "^1.6.0",
"signature_pad": "^3.0.0-beta.4",
"vue": "^2.6.11",
"vue-qr": "^2.3.0",
"vue-router": "^3.2.0",
"vue-signature-pad": "^2.0.2",
"vue-ueditor-wrap": "^2.4.4",
"vuex": "^3.4.0"
},
......
src/antd/register.js
View file @ 6250f541
......@@ -4,7 +4,7 @@ import '../../static/css/global.less'
// 引入nprogress进度条
import 'nprogress/nprogress.css'
import Print from '../views/utils/Print'
import VueSignature from "vue-signature-pad";
// import VueSignature from "vue-signature-pad";
// 引入antd
import { Button, Layout, Menu,
Icon, Row, Col, Spin, Card,
......@@ -67,4 +67,4 @@ Vue.use(Progress)
Vue.use(Alert)
Vue.use(Message)
Vue.use(Popover)
Vue.use(VueSignature)//签字画板
// Vue.use(VueSignature)//签字画板
src/router/index.js
View file @ 6250f541
......@@ -6,7 +6,7 @@ import storeInfo from '../store/index'
// 进度条
import NProgress from 'nprogress'
let activeUrl = window.sessionStorage.getItem('activeItem') || '/Home/folviteIndex'
let activeUrl = window.sessionStorage.getItem('activeItem') || '/Home/inStock'
NProgress.configure({showSpinner: false});
Vue.use(VueRouter)
......@@ -66,23 +66,23 @@ const router = new VueRouter({
router.beforeEach((to, form, next) => {
NProgress.start();
// if (to.path === '/Home/folviteIndex') {
// return next();
return next();
// };
//未匹配到配置路由,默认跳转登录页
if (to.matched.length === 0){
next("/Login");
return ;
}
if (to.path==='/Login'){
next();
return;
}
// if (to.matched.length === 0){
// next("/Login");
// return ;
// }
// if (to.path==='/Login'){
// next();
// return;
// }
const token = window.sessionStorage.getItem('token');
if (token) {
next();
} else {
next("/Login");
//window.top.postMessage({messageType:"LOGOUT"}, '*')
// next("/Login");
window.top.postMessage({messageType:"LOGOUT"}, '*')
}
});
router.afterEach((to, form, next) => {
......
src/views/Home.vue
View file @ 6250f541
......@@ -3,7 +3,7 @@
<a-layout>
<a-layout-content class="layout_container" style="background: #fff">
<div style="padding: 24px;">
<a-tabs type="card" :tabBarGutter="10" v-model="$store.state.activeKeyInfo" @change="onChange">
<!-- <a-tabs type="card" :tabBarGutter="10" v-model="$store.state.activeKeyInfo" @change="onChange">
<a-tab-pane v-for="(item, index) in $store.state.tabsInfo" :key="item.frontActionUrl" >
<span slot="tab">
<span v-if="item.frontActionUrl != '/Home/distributionWarehousing' && item.frontActionUrl != '/Home/folviteApply'"
......@@ -12,10 +12,10 @@
<span v-if="item.frontActionUrl == '/Home/distributionWarehousing'">{{item.name}}<span>(0)</span></span>
<span v-if="item.frontActionUrl == '/Home/folviteApply'">{{item.name}}<span>(0)</span></span>
</span>
<!--<span>{{item.name}}</span>-->
&lt;!&ndash;<span>{{item.name}}</span>&ndash;&gt;
</span>
</a-tab-pane>
</a-tabs>
</a-tabs>-->
<router-view></router-view>
</div>
......@@ -54,11 +54,12 @@
},
created() {
//获取妇幼权限和登录基本信息
// document.cookie = 'bGNnd3lwdF9hdA=8f26b5cc-1d66-4b31-8b86-26d916209e1e;'//昆明市
document.cookie = 'bGNnd3lwdF9hdA=' + sessionStorage.getItem("loginToken") + ';'//云南省
document.cookie = 'bGNnd3lwdF9hdA=30fc7c05-8f84-490d-8bcb-18f5a7c885db;'//昆明市
// document.cookie = 'bGNnd3lwdF9hdA=' + sessionStorage.getItem("loginToken") + ';'//云南省
let cookieToken = getCookie('bGNnd3lwdF9hdA');
console.log('tokenInfo',cookieToken)
if (cookieToken) {//根据cookie获取token并调用接口获取菜单并设置初始选中菜单
//window.sessionStorage.setItem('token', 'bearer' + ' ' + cookieToken);
window.sessionStorage.setItem('token', 'bearer' + ' ' + cookieToken);
let par = {}
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
// window.sessionStorage.setItem('menuList', JSON.stringify(data.menuList));
......@@ -77,19 +78,21 @@
setInitMenuInfo() {//设置默认菜单和菜单缓存
// this.menuList = JSON.parse(window.sessionStorage.getItem('menuList'));
this.menuList = this.menuTest
if (!window.sessionStorage.getItem("tabs")) {
/* if (!window.sessionStorage.getItem("tabs")) {
window.sessionStorage.setItem('tabs', JSON.stringify(this.menuTest));
this.$store.commit('changeTabs', this.menuTest)
this.tabs = this.$store.state.tabsInfo
}
if (!window.sessionStorage.getItem('activeItem')) {
}*/
/* if (!window.sessionStorage.getItem('activeItem')) {
window.sessionStorage.setItem('activeItem', '/Home/inStock')
}
if (!window.sessionStorage.getItem('activeKey')) {
this.$router.push({path:'/Home/inStock'})
}*/
/* if (!window.sessionStorage.getItem('activeKey')) {
let nowUrl = window.location.href
this.$router.push({path:nowUrl, query:{}})
this.$store.commit('changeActKey', '/Home/inStock')
}
const tabs = JSON.parse(window.sessionStorage.getItem('tabs'));
}*/
/* const tabs = JSON.parse(window.sessionStorage.getItem('tabs'));
if (tabs) {
this.tabs = tabs;
this.$store.commit('changeTabs', tabs)
......@@ -98,7 +101,7 @@
if (activeKey) {
this.activeKey = activeKey;
this.$store.commit('changeActKey', activeKey)
}
}*/
},
......
src/views/Login.vue
View file @ 6250f541
<!--
<template>
<div class="login_container">
<div class="login_box">
......@@ -45,7 +46,7 @@
<a-button @click="login" type="primary" block size="large" :disabled="!captchaVerificationVis"
:loading="loading" @keyup.enter="login">登录
</a-button>
<!-- <a href="javascript:;" style="float: right;text-decoration: none;" @click="toNetwork">网点管理登录</a> -->
&lt;!&ndash; <a href="javascript:;" style="float: right;text-decoration: none;" @click="toNetwork">网点管理登录</a> &ndash;&gt;
</a-form-model>
</div>
</div>
......@@ -157,3 +158,4 @@
}
}
</style>
-->
src/views/indexComponent/InformedConsent/InformedConsent.vue
View file @ 6250f541
......@@ -39,10 +39,15 @@
]
},
formDisabled: false,
modeType: "update"
modeType: "update",
routerParams:{}
}
},
created() {
this.routerParams = this.$route.query
if (this.routerParams.menuId) {
window.sessionStorage.setItem('menuId', this.routerParams.menuId)
}
},
mounted() {
},
......
src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue
View file @ 6250f541
......@@ -42,7 +42,7 @@
</div>
</template>
<script>
import {isEmptyParams} from "../../utils/common";
import {getEnumByFlag, isEmptyParams} from "../../utils/common";
import moment from 'moment'
import myPagination from "../../components/myPagination";
import dateRangePicker from "../../components/dateRangePicker";
......@@ -132,14 +132,30 @@
tableData: [],
loading: false,
allSupplyInfo: [],
routerParams:{}
}
},
created() {
let allEnum = JSON.parse(sessionStorage.getItem("allEnum"));
this.statusList = allEnum["folacin_stock_record_status"];
this.routerParams = this.$route.query
if (this.routerParams.menuId) {
window.sessionStorage.setItem('menuId', this.routerParams.menuId)
}
this.getEnumListInfo()
this.getReceiveRecord()
},
methods: {
getEnumListInfo() {
if (window.sessionStorage.getItem('allEnum')) {
this.statusList = getEnumByFlag("folacin_resident_info_status");
} else {
let par = {}
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
this.statusList = getEnumByFlag("folacin_resident_info_status");
})
}
},
searchList() {
this.pagination.pageIndex = 1
this.getReceiveRecord()
......
src/views/indexComponent/distributionWarehousing/sendRecord.vue
View file @ 6250f541
......@@ -50,7 +50,7 @@
<script>
import myPagination from '../../components/myPagination'
import dateRangePicker from '../../components/dateRangePicker'
import {isEmptyParams} from "../../utils/common";
import {getEnumByFlag, isEmptyParams} from "../../utils/common";
import moment from 'moment';
const columns = [
......@@ -186,16 +186,34 @@
tableData: [],
loading: false,
allSupplyInfo: [],
routerParams:{}
}
},
created() {
this.routerParams = this.$route.query
if (this.routerParams.menuId) {
window.sessionStorage.setItem('menuId', this.routerParams.menuId)
}
this.getEnumListInfo()
},
mounted() {
let allEnum = JSON.parse(sessionStorage.getItem("allEnum"));
this.statusList = allEnum["folacin_stock_record_status"];
// let allEnum = JSON.parse(sessionStorage.getItem("allEnum"));
// this.statusList = allEnum["folacin_stock_record_status"];
this.getSendRecord()
},
methods: {
getEnumListInfo() {
if (window.sessionStorage.getItem('allEnum')) {
this.statusList = getEnumByFlag("folacin_resident_info_status");
} else {
let par = {}
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
this.statusList = getEnumByFlag("folacin_resident_info_status");
})
}
},
searchList() {
this.pagination.pageIndex = 1
this.getSendRecord()
......
src/views/indexComponent/folviteApply/folviteApply.vue
View file @ 6250f541
......@@ -127,14 +127,31 @@
columns,
tableData: [],
loading: false,
routerParams:{}
}
},
created() {
this.statusList = getEnumByFlag('folacin_resident_info_status')
this.routerParams = this.$route.query
if (this.routerParams.menuId) {
window.sessionStorage.setItem('menuId', this.routerParams.menuId)
}
this.getEnumListInfo()
this.getFolviteApplyList()
},
methods: {
getEnumListInfo() {
if (window.sessionStorage.getItem('allEnum')) {
this.statusList = getEnumByFlag("folacin_resident_info_status");
} else {
let par = {}
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
this.statusList = getEnumByFlag("folacin_resident_info_status");
})
}
},
searchList() {
this.pagination.pageIndex = 1
this.getFolviteApplyList()
......
src/views/indexComponent/folviteDistribution/folviteDistribution.vue
View file @ 6250f541
......@@ -109,6 +109,10 @@
}
},
created() {
this.routerParams = this.$route.query
if (this.routerParams.menuId) {
window.sessionStorage.setItem('menuId', this.routerParams.menuId)
}
this.getFolviteDistributionList()
},
methods: {
......
src/views/indexComponent/inStockManage/inStockManage.vue
View file @ 6250f541
......@@ -106,7 +106,7 @@
</div>
</template>
<script>
import {isNotBlank, isEmptyParams} from "../../utils/common";
import {isNotBlank, isEmptyParams, getEnumByFlag} from "../../utils/common";
import moment from 'moment'
const columns = [
......@@ -187,14 +187,31 @@
selectedRowKeys: [],
selectedVisible: false,
selectedRowList: [],
routerParams: {}
}
},
created() {
this.routerParams = this.$route.query
if (this.routerParams.menuId) {
window.sessionStorage.setItem('menuId', this.routerParams.menuId)
}
this.getInStockList();
this.getAllSupply();
this.brandList = JSON.parse(sessionStorage.getItem("allEnum"))["folacin_stock_record_brand_id"];
this.getEnumListInfo()
},
methods: {
getEnumListInfo() {
if (window.sessionStorage.getItem('allEnum')) {
this.brandList = getEnumByFlag("folacin_stock_record_brand_id");
} else {
let par = {}
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
this.brandList = getEnumByFlag("folacin_stock_record_brand_id");
})
}
},
getAllSupply() {
let par = {}
this.$api.common.fetchAllSupply(par).then(({data = []}) => {
......
src/views/indexComponent/stockTransfer/stockTransfer.vue
View file @ 6250f541
......@@ -53,7 +53,7 @@
</div>
</template>
<script>
import {isNotBlank, isEmptyParams} from "../../utils/common";
import {isNotBlank, isEmptyParams, getEnumByFlag} from "../../utils/common";
import dateRangePicker from '../../components/dateRangePicker';
import myPagination from '../../components/myPagination'
import moment from 'moment'
......@@ -129,17 +129,34 @@
loading: false,
allSupplyInfo: [],
brandList: [],
stockTypeList: []
stockTypeList: [],
routerParams:{}
}
},
created() {
this.routerParams = this.$route.query
if (this.routerParams.menuId) {
window.sessionStorage.setItem('menuId', this.routerParams.menuId)
}
this.getEnumListInfo()
this.getStockTransferList();
this.getAllSupply();
let allEnum = JSON.parse(sessionStorage.getItem("allEnum"));
this.brandList = allEnum["folacin_stock_record_brand_id"];
this.stockTypeList = allEnum["folacin_stock_transfer_stock_type"];
},
methods: {
getEnumListInfo() {
if (window.sessionStorage.getItem('allEnum')) {
this.brandList = getEnumByFlag("folacin_stock_record_brand_id");
this.stockTypeList = getEnumByFlag("folacin_stock_transfer_stock_type")
} else {
let par = {}
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
this.brandList = getEnumByFlag("folacin_stock_record_brand_id");
this.stockTypeList = getEnumByFlag("folacin_stock_transfer_stock_type")
})
}
},
getAllSupply() {
let par = {}
this.$api.common.fetchAllSupply(par).then(({data = []}) => {
......
src/views/indexComponent/supplyManage/supplyManage.vue
View file @ 6250f541
......@@ -57,7 +57,7 @@
</div>
</template>
<script>
import {isEmptyParams} from "../../utils/common";
import {getEnumByFlag, isEmptyParams} from "../../utils/common";
const columns = [
{
title: '供应商名称',
......@@ -114,14 +114,31 @@
columns,
tableData: [],
loading: false,
allFactoryInfo: []
allFactoryInfo: [],
routerParams: {}
}
},
created() {
this.routerParams = this.$route.query
if (this.routerParams.menuId) {
window.sessionStorage.setItem('menuId', this.routerParams.menuId)
}
this.getSupplyList();
this.allFactoryInfo = JSON.parse(sessionStorage.getItem("allEnum"))["public_state"];
this.getEnumListInfo()
},
methods: {
getEnumListInfo() {
if (window.sessionStorage.getItem('allEnum')) {
this.allFactoryInfo = getEnumByFlag("public_state");
} else {
let par = {}
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
this.allFactoryInfo = getEnumByFlag("public_state");
})
}
},
searchList() {
this.pagination.pageIndex = 1;
this.getSupplyList()
......
src/views/utils/common.js
View file @ 6250f541
import moment from 'moment';
import storeInfo from '../../store/index'
import router from "../../router";
import Veu from 'vue'
//对象、一维数组去重(返回一个新数组)
export const singleArr = (arr, val) => {
......
src/views/utils/loginApi.js
View file @ 6250f541
/*
import axios from 'axios';
import {Base64} from "js-base64";
import CryptoJS from 'crypto-js'
......@@ -42,3 +43,4 @@ export const aesEncrypt = word => {
return encrypted.toString();
}
*/
vue.config.js
View file @ 6250f541
......@@ -17,7 +17,7 @@ module.exports = {
runtimeCompiler: true,
indexPath: "index.html",
publicPath: '/', // 设置打包文件相对路径
outputDir: 'unit-login',
outputDir: 'dist',
/* configureWebpack: {
//关闭 webpack 的性能提示
performance: {
......@@ -59,7 +59,7 @@ module.exports = {
warning: false,
errors: false
},
// https:true,
https:true,
},
chainWebpack: (config) => {
config.plugins.delete('preload')
......
yarn.lock
View file @ 6250f541
......@@ -2885,11 +2885,6 @@ crypto-browserify@^3.11.0:
randombytes "^2.0.0"
randomfill "^1.0.3"
crypto-js@^4.0.0:
version "4.0.0"
resolved "https://registry.npmjs.org/crypto-js/-/crypto-js-4.0.0.tgz"
integrity sha512-bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg==
css-color-names@0.0.4, css-color-names@^0.0.4:
version "0.0.4"
resolved "https://registry.npm.taobao.org/css-color-names/download/css-color-names-0.0.4.tgz"
......@@ -5225,11 +5220,6 @@ merge-descriptors@1.0.1:
resolved "https://registry.npm.taobao.org/merge-descriptors/download/merge-descriptors-1.0.1.tgz"
integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
merge-images@^1.1.0:
version "1.2.0"
resolved "https://registry.npmjs.org/merge-images/-/merge-images-1.2.0.tgz"
integrity sha512-hEGvgnTdXr08uzGvEArxRsKpy7WmozM73YaSi4s5IYF4LxrhANpqfHaz9CgBZ5+0+s2NsjPnPdStz3aCc0Yulw==
merge-source-map@^1.1.0:
version "1.1.0"
resolved "https://registry.npm.taobao.org/merge-source-map/download/merge-source-map-1.1.0.tgz"
......@@ -7110,11 +7100,6 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
resolved "https://registry.npm.taobao.org/signal-exit/download/signal-exit-3.0.3.tgz"
integrity sha1-oUEMLt2PB3sItOJTyOrPyvBXRhw=
signature_pad@^3.0.0-beta.3, signature_pad@^3.0.0-beta.4:
version "3.0.0-beta.4"
resolved "https://registry.npmjs.org/signature_pad/-/signature_pad-3.0.0-beta.4.tgz"
integrity sha512-cOf2NhVuTiuNqe2X/ycEmizvCDXk0DoemhsEpnkcGnA4kS5iJYTCqZ9As7tFBbsch45Q1EdX61833+6sjJ8rrw==
simple-swizzle@^0.2.2:
version "0.2.2"
resolved "https://registry.npm.taobao.org/simple-swizzle/download/simple-swizzle-0.2.2.tgz"
......@@ -8033,15 +8018,6 @@ vue-router@^3.2.0:
resolved "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.3.tgz"
integrity sha1-+pN2hhbuM4qhdPFgrJZRZ/pXL/o=
vue-signature-pad@^2.0.2:
version "2.0.2"
resolved "https://registry.npmjs.org/vue-signature-pad/-/vue-signature-pad-2.0.2.tgz"
integrity sha512-zJ7Rs8//486m0lY095xGiBnJnHPz4iBVpQfL/5Y1XJ/O0yMbSbDhE+lFKBskjXQRLjoAcYZx5dgeYlcLG7T6Hw==
dependencies:
merge-images "^1.1.0"
signature_pad "^3.0.0-beta.3"
vue "^2.6.11"
vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
version "4.1.2"
resolved "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.2.tgz?cache=0&sync_timestamp=1586263943341&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-style-loader%2Fdownload%2Fvue-style-loader-4.1.2.tgz"
......
yesuan_pc.zip 0 → 100644
View file @ 6250f541
File added
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