diff --git a/.env.yueyang b/.env.yueyang
new file mode 100644
index 0000000000000000000000000000000000000000..6865ac42dbfc92e6f1801e32303b246c0de82255
--- /dev/null
+++ b/.env.yueyang
@@ -0,0 +1,5 @@
+NODE_ENV = yueyang
+VUE_APP_BASE_URL1 = https://beta-ysservice.yiboshi.com
+VUE_APP_BASE_URL =https://yyys-service.yiboshi.com
+VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
+VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'
diff --git a/package.json b/package.json
index e1a42892993365a41f2d23a781ea7e6fc980504b..a4c448e240542c7eccac2b8daedf76bc33c5dd2d 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,8 @@
"scripts": {
"serve": "vue-cli-service serve --mode dev",
"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"
},
"dependencies": {
"ant-design-vue": "^1.6.4",
@@ -13,6 +14,7 @@
"compression-webpack-plugin": "5.0.0",
"core-js": "^3.6.5",
"http-parser-js": "^0.5.3",
+ "jsonp": "^0.2.1",
"moment": "^2.29.1",
"moment-locales-webpack-plugin": "^1.2.0",
"nprogress": "^0.2.0",
@@ -21,8 +23,7 @@
"vue-qr": "^2.3.0",
"vue-router": "^3.2.0",
"vue-ueditor-wrap": "^2.4.4",
- "vuex": "^3.4.0",
- "jsonp": "^0.2.1"
+ "vuex": "^3.4.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/src/views/Home_dev.vue b/src/views/Home_dev.vue
index edc1800ab0672b4ed418b8f5bd1842a831eae95c..a16a3756cc91cf1648c9a7a4115fe97f2e7b6d3e 100644
--- a/src/views/Home_dev.vue
+++ b/src/views/Home_dev.vue
@@ -13,12 +13,16 @@
<!-- <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>
+
+ </a-tab-pane>
+ <a-tab-pane :key="111">
+ <span slot="tab">
+ <span>{{unitInfo.unitName}}</span>
+ </span>
</a-tab-pane>
</a-tabs>
<router-view></router-view>
</div>
-
</a-layout-content>
<div style="clear: both"></div>
</a-layout>
@@ -50,6 +54,7 @@
activeKey: '',
showChildren: false,
menuTest,
+ unitInfo: {}
}
},
created() {
@@ -60,6 +65,7 @@
if (cookieToken) {
let par = {}
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
+ this.unitInfo = data.unitInfo;
window.sessionStorage.setItem('menuList', JSON.stringify(this.menuList));
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
window.sessionStorage.setItem('unitInfo', JSON.stringify(data.unitInfo));
diff --git a/src/views/Login.vue b/src/views/Login.vue
index beb405d58a41bedb9867d2803debd403ce3698fc..cff7dd3bb157bd8bf91184d9658580013c813e57 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,4 +1,4 @@
-<!--
+
<template>
<div class="login_container">
<div class="login_box">
@@ -9,9 +9,9 @@
</div>
<a-form-model :model="formData" :rules="formRules" class="login_form" ref="formRef">
<a-form-model-item prop="username">
- <!– <a-input placeholder="请输入用户名" v-model="formData.username" size="large" @keyup.enter="login">–>
- <!– <a-icon slot="prefix" type="user"/>–>
- <!– </a-input>–>
+ <!-- <a-input placeholder="请输入用户名" v-model="formData.username" size="large" @keyup.enter="login">-->
+ <!-- <a-icon slot="prefix" type="user"/>-->
+ <!-- </a-input>-->
<a-select v-model="formData.username" size="large" @change="userChange">
<a-select-option v-for="(i,index) in userList" :key="i.userName" :value="index">
{{i.unitName+"("+i.userName+")"}}
@@ -70,10 +70,10 @@
created() {
let unitNames = ["云南省妇幼保健院","云南省妇幼保健院（供应商管理)","昆明市妇幼保健院", "五华区妇幼保健院", "五华区普吉大普吉社区卫生服务中心",
"五华区普吉新村社区卫生服务站", "五华区普吉林家院社区卫生服务站", "五华区大观社区卫生服务中心", "五华区护国南通街社区卫生服务站",
- "五华区大观新闻里社区卫生服务中心"];
- let userNames = ["3163915418", "3104754897","3458022605", "4040050358", "0892676849", "7381485204", "4681975615",
- "0580382354", "2409311755", "7531945226"];
- let passwords = ["ynfy2021","075546","078730", "073657", "07473X", "072179", "074991", "076479", "079813", "076831"];
+ "五华区大观新闻里社区卫生服务中心","医博士妇幼保健院"];
+ 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]});
})
@@ -157,5 +157,5 @@
}
}
</style>
-–>
+-->
-->
diff --git a/src/views/indexComponent/folviteDistribution/folviteDistribution.vue b/src/views/indexComponent/folviteDistribution/folviteDistribution.vue
index a9cd59273dced1f47789d2371dfd858c7bf9c675..ac55ef1aa76e808c4550f84fb6343159f65f8052 100644
--- a/src/views/indexComponent/folviteDistribution/folviteDistribution.vue
+++ b/src/views/indexComponent/folviteDistribution/folviteDistribution.vue
@@ -81,8 +81,8 @@
<img style="width: 100%" :src="consentUrl" height="100%"/>
</div>
<div v-else>
- <div style="white-space:pre;text-indent:2em">
- <div v-html="consentInfo" style="white-space:pre">
+ <div>
+ <div v-html="consentInfo" style="width: 100%">
</div>
<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>
diff --git a/src/views/indexComponent/inStockManage/inStockManage.vue b/src/views/indexComponent/inStockManage/inStockManage.vue
index 50b55b0996764fc4cdac4a5d5f08bcb9d9aa7b1b..383ee524750cc75e1c600c3d2eb1b3e97a6bfe90 100644
--- a/src/views/indexComponent/inStockManage/inStockManage.vue
+++ b/src/views/indexComponent/inStockManage/inStockManage.vue
@@ -211,6 +211,7 @@
}
},
created() {
+ this.unitInfo = JSON.parse(sessionStorage.getItem("unitInfo"));
this.routerParams = this.$route.query
if (this.routerParams.menuId) {
window.sessionStorage.setItem('menuId', this.routerParams.menuId)
@@ -224,7 +225,7 @@
getEnumListInfo() {
if (window.sessionStorage.getItem('allEnum')) {
this.brandList = getEnumByFlag("folacin_stock_record_brand_id");
- this.unitInfo = JSON.parse(sessionStorage.getItem("unitInfo"))
+ this.unitInfo = JSON.parse(sessionStorage.getItem("unitInfo"));
} else {
let par = {
menuId: this.menuId
diff --git a/src/views/indexComponent/supplyManage/components/addSupply.vue b/src/views/indexComponent/supplyManage/components/addSupply.vue
index edecbfc4f60a98f2ded599faedd9e36f1fd45c1b..15cb7259e2e1a689e89343317564f29f26f9423c 100644
--- a/src/views/indexComponent/supplyManage/components/addSupply.vue
+++ b/src/views/indexComponent/supplyManage/components/addSupply.vue
@@ -177,10 +177,13 @@
submitForm() {
let vm = this;
this.$refs.formRef.validate(valid => {
- if (true) {
+ if (valid) {
// vm.subLoad = true;
- const {areaCode, areaName, ...others} = vm.formData
- let areaInfo = areaCode[areaCode.length - 1]
+ const {areaCode, areaName, ...others} = vm.formData;
+ let areaInfo = "";
+ if (this.$api.utils.isNoBlank(areaCode)) {
+ areaInfo = areaCode[areaCode.length - 1];
+ }
let par = {
areaCode: areaInfo,
...others,
diff --git a/static/css/global.less b/static/css/global.less
index 5a8c745627a60027cdf1585f70674d52c4bde906..a814a51682d919a06bfbebe01f38be6168bdfc53 100644
--- a/static/css/global.less
+++ b/static/css/global.less
@@ -302,5 +302,10 @@ ant-pagination-item:focus, .ant-pagination-item:hover {
color: #FF4D80;
border: 1px solid #FF4D80;
}
-
+.ant-tag-blue{
+ background-color: #FF4D80;color: white;border: 0;cursor:pointer;
+}
+.ant-tag-blue:hover{
+ background-color: red;
+}
//---------------------------------------------------------