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

 Conflicts:
	src/views/utils/loginApi.js

src/api/fetch.js

@@ -39,6 +39,7 @@ function fetch(url = '', params = {}, method = 'get', contentType = 'form', toke
             data: params,
             headers: {
                 Authorization: token || window.sessionStorage.getItem('token'),
+                menuId: window.sessionStorage.getItem('menuId'),
                 'Content-Type': contentType,
             }
         }).then(function (response) {

src/views/Home.vue

@@ -54,7 +54,7 @@
         },
         created() {
             //获取妇幼权限和登录基本信息
-            document.cookie = 'bGNnd3lwdF9hdA=30fc7c05-8f84-490d-8bcb-18f5a7c885db;'//昆明市
+            // document.cookie = 'bGNnd3lwdF9hdA=ef814f88-005f-4820-830d-b834edb47a55;'//昆明市
             // document.cookie = 'bGNnd3lwdF9hdA=' + sessionStorage.getItem("loginToken") + ';'//云南省
             let cookieToken = getCookie('bGNnd3lwdF9hdA');
             console.log('tokenInfo',cookieToken)

src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue

@@ -150,8 +150,8 @@
                 } 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))
+                        window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
                         this.statusList = getEnumByFlag("folacin_resident_info_status");
                     })
                 }

src/views/indexComponent/distributionWarehousing/sendRecord.vue

@@ -208,8 +208,8 @@
                 } 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))
+                        window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
                         this.statusList = getEnumByFlag("folacin_resident_info_status");
                     })
                 }

src/views/indexComponent/folviteApply/folviteApply.vue

@@ -146,8 +146,8 @@
                 } 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))
+                        window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
                         this.statusList = getEnumByFlag("folacin_resident_info_status");
                     })
                 }

src/views/indexComponent/folviteDistribution/components/inStockManageInfo.vue

 <template>
     <div class="inStockManage">
-        <a-modal title="选择要发放的叶酸种类" v-if="visible" :visible="visible" @cancel="visible = false" @ok="getChecked" :maskClosable="false"
+        <!--:getContainer="() => window.parent.document.body"-->
+        <a-modal title="选择要发放的叶酸种类" v-if="visible"
+                 :visible="visible" @cancel="visible = false"
+                 @ok="getChecked"
+                 :maskClosable="false"
                  width="1100px" >
         <a-form layout="inline" class="search_form">
             <a-form-item label="供应商名称">
@@ -245,6 +249,9 @@
             onSelectChange(selectedRowKeys) {
                 this.selectedRowKeys = selectedRowKeys;
             },
+            // getContainer() {
+            //     return window.parent.document.body;
+            // },
             getChecked() {
             this.$emit('selectedIdList', this.selectedRowKeys)
             }

src/views/indexComponent/inStockManage/inStockManage.vue

@@ -23,7 +23,7 @@
             <a-button type="primary" icon="search" class="search_btn" @click="searchList">搜索</a-button>
             <a-button class="search_btn" icon="close" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
 
-            <div style="float: right">
+           <!-- <div>
                 <a-button type="primary" icon="plus" class="search_btn btn_space" @click="openModal">库存录入</a-button>
                 <a-button type="primary" icon="gift" class="search_btn btn_space"
                           :disabled="selectedRowKeys.length <= 0"
@@ -31,7 +31,7 @@
                 </a-button>
                 <a-button type="primary" icon="download" class="search_btn btn_space" @click="downLoadExcel">导出Excel
                 </a-button>
-            </div>
+            </div>-->
 
             <div style="clear: both"></div>
         </a-form>
@@ -64,13 +64,13 @@
                                                                                                        style="margin-left:10px;font-size: 10px"/> </span>
             </a-popover>
         </div>
-        <!--        <div style="margin-top: 16px;margin-bottom: 10px">-->
-        <!--            <a-button type="primary" class="search_btn btn_space" @click="openModal">库存录入</a-button>-->
-        <!--            <a-button type="primary" class="search_btn btn_space" :disabled="selectedRowKeys.length <= 0"-->
-        <!--                      @click="toAdd">调拨分配-->
-        <!--            </a-button>-->
-        <!--            <a-button type="primary" class="search_btn btn_space">导出Excel</a-button>-->
-        <!--        </div>-->
+                <div style="margin-top: 16px;margin-bottom: 10px">
+                    <a-button type="primary" class="search_btn btn_space" @click="openModal">库存录入</a-button>
+                    <a-button type="primary" class="search_btn btn_space" :disabled="selectedRowKeys.length <= 0"
+                              @click="toAdd">调拨分配
+                    </a-button>
+                    <a-button type="primary" class="search_btn btn_space">导出Excel</a-button>
+                </div>
 
         <div style="clear: both"></div>
         <a-table :dataSource="tableData"
@@ -206,8 +206,8 @@
                 } 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))
+                        window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
                         this.brandList = getEnumByFlag("folacin_stock_record_brand_id");
                     })
                 }

src/views/indexComponent/stockTransfer/stockTransfer.vue

@@ -150,8 +150,8 @@
                 } 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))
+                        window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
                         this.brandList = getEnumByFlag("folacin_stock_record_brand_id");
                         this.stockTypeList = getEnumByFlag("folacin_stock_transfer_stock_type")
                     })

src/views/indexComponent/supplyManage/supplyManage.vue

@@ -133,8 +133,8 @@
                 } 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))
+                        window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
                         this.allFactoryInfo = getEnumByFlag("public_state");
                     })
                 }