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

# Conflicts:
#	src/views/indexComponent/folviteDistribution/folviteDistribution.vue

src/views/Home_dev.vue

@@ -14,7 +14,6 @@
                             <!--                            <span v-if="item.frontActionUrl == '/Home/folviteApply'">{{item.name}}<span>(0)</span></span>-->
                             </span>
                             <span>{{item.name}}</span>
-                            </span>
                         </a-tab-pane>
                     </a-tabs>
                     <router-view></router-view>
@@ -57,14 +56,14 @@
             document.cookie = 'bGNnd3lwdF9hdA=' + sessionStorage.getItem("token") + ';'//云南省
             let cookieToken = getCookie('bGNnd3lwdF9hdA');
             cookieToken = sessionStorage.getItem("token");
-            console.log('tokenInfo', cookieToken)
-            this.menuList=menuTest;
+            this.menuList = menuTest;
             if (cookieToken) {
                 let par = {}
                 this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
                     window.sessionStorage.setItem('menuList', JSON.stringify(this.menuList));
                     window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
-                    window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
+                    window.sessionStorage.setItem('unitInfo', JSON.stringify(data.unitInfo));
+                    window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList));
                     this.setInitMenuInfo()
                     this.showChildren = true
                 })
@@ -77,7 +76,6 @@
         methods: {
             setInitMenuInfo() {//设置默认菜单和菜单缓存
                 this.menuList = menuTest;
-                console.log( this.menuList )
                 this.menuList = this.menuTest
                 if (!window.sessionStorage.getItem("tabs")) {
                     window.sessionStorage.setItem('tabs', JSON.stringify(this.menuTest));

src/views/Login.vue

@@ -68,12 +68,12 @@
             }
         },
         created() {
-            let unitNames = ["云南省妇幼保健院", "昆明市妇幼保健院", "五华区妇幼保健院", "五华区普吉大普吉社区卫生服务中心",
+            let unitNames = ["云南省妇幼保健院","云南省妇幼保健院（供应商管理)","昆明市妇幼保健院", "五华区妇幼保健院", "五华区普吉大普吉社区卫生服务中心",
                 "五华区普吉新村社区卫生服务站", "五华区普吉林家院社区卫生服务站", "五华区大观社区卫生服务中心", "五华区护国南通街社区卫生服务站",
                 "五华区大观新闻里社区卫生服务中心"];
-            let userNames = ["3163915418", "3458022605", "4040050358", "0892676849", "7381485204", "4681975615",
+            let userNames = ["3163915418", "3104754897","3458022605", "4040050358", "0892676849", "7381485204", "4681975615",
                 "0580382354", "2409311755", "7531945226"];
-            let passwords = ["079231", "078730", "073657", "07473X", "072179", "074991", "076479", "079813", "076831"];
+            let passwords = ["ynfy2021","075546","078730", "073657", "07473X", "072179", "074991", "076479", "079813", "076831"];
             unitNames.forEach((x, index) => {
                 this.userList.push({unitName: x, userName: userNames[index], password: passwords[index]});
             })

src/views/indexComponent/folviteDistribution/folviteDistribution.vue

@@ -78,14 +78,14 @@
                 <img style="width: 100%" :src="consentUrl" height="100%"/>
             </div>
             <div v-else>
-                <div style="white-space:pre;text-indent:2em">
+                <div style="float: right;white-space:pre;text-indent:2em">
                     <div v-html="consentInfo" style="white-space:pre">
                     </div>
-                    <div style="float: right;margin: 0px 10px">
+                    <div style="float: right">
                         <div style="height: 60px">签名: <img style="width:200px;height: 40px;" :src="applySignUrl" height="100%"/></div>
                         <div>签署日期:{{currentRow.parentDate}}</div>
+                        <br><br>
                     </div>
-                    <div style="clear: both"></div>
 
                 </div>
             </div>
@@ -242,7 +242,7 @@
                 this.$router.push({path: '/folviteDistribution/add', query: {routerFlag: 'add'}})
             },
             toDetail(record) {
-                this.$router.push({path: '/folviteDistribution/detail', query: record})
+                this.$router.push({path: '/folviteDistribution/detail', query: {id: record.id}})
             },
             uploadConsentInfo(row) {
                 this.formData.id = row.id;