新页签打开

.env.dev

 NODE_ENV = dev
+
 VUE_APP_BASE_URL = https://beta-ysservice.yiboshi.com
+VUE_APP_BASE_URL1 = https://ys-service.yiboshi.com
+VUE_APP_BASE_URL1 = https://yyys-service.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'
+
+VUE_APP_LOCATION = https://beta-yesuan.yiboshi.com/#/
+VUE_APP_LOCATION1 = https://yesuan.yiboshi.com/#/

.env.production

 NODE_ENV = prod
 VUE_APP_BASE_URL1 = https://beta-ysservice.yiboshi.com
-VUE_APP_BASE_URL = https://ys-service.yiboshi.com
+VUE_APP_BASE_URL1 = https://ys-service.yiboshi.com
+VUE_APP_BASE_URL = https://beta-ysservice.yiboshi.com
 VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
 VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'
+
+VUE_APP_LOCATION = https://beta-yesuan.yiboshi.com/#/
+VUE_APP_LOCATION1 = https://yesuan.yiboshi.com/#/

src/views/Home.vue

@@ -54,7 +54,7 @@
         },
         created() {
             //获取妇幼权限和登录基本信息
-            // document.cookie = 'bGNnd3lwdF9hdA=5e7516d7-889b-4b19-9490-e9ce576daba2;'//昆明市
+            // document.cookie = 'bGNnd3lwdF9hdA=c64fae79-c4a9-485d-8828-38779bb3b5d2;'//昆明市
             // document.cookie = 'bGNnd3lwdF9hdA=' + sessionStorage.getItem("loginToken") + ';'//云南省
             let cookieToken = getCookie('bGNnd3lwdF9hdA');
             console.log('tokenInfo',cookieToken)
@@ -107,18 +107,18 @@
             },
 
             // 点击tabs标签
-            onChange(activeKey) {
-                this.activeKey = activeKey;
-                window.sessionStorage.setItem('activeKey', this.activeKey);
-                this.$store.commit('changeActKey', this.activeKey)
-                this.$store.state.tabsInfo.forEach((item, i) => {
-                    if (item.frontActionUrl === activeKey) {
-                        this.activeItem = [item.frontActionUrl];
-                        window.sessionStorage.setItem('activeItem', this.activeItem);
-                        this.$router.push(item.frontActionUrl);
-                    }
-                });
-            },
+            // onChange(activeKey) {
+            //     this.activeKey = activeKey;
+            //     window.sessionStorage.setItem('activeKey', this.activeKey);
+            //     this.$store.commit('changeActKey', this.activeKey)
+            //     this.$store.state.tabsInfo.forEach((item, i) => {
+            //         if (item.frontActionUrl === activeKey) {
+            //             this.activeItem = [item.frontActionUrl];
+            //             window.sessionStorage.setItem('activeItem', this.activeItem);
+            //             this.$router.push(item.frontActionUrl);
+            //         }
+            //     });
+            // },
         },
     }
 </script>

src/views/indexComponent/InformedConsent/InformedConsent.vue

@@ -111,7 +111,8 @@
                 });
             },
             backList() {
-                closedDetail('/system/addTemplate')
+                window.top.postMessage({messageType:'THIRD_PAGECHANGE',name:`${this.routerParams.menuName}`,source:"yesuan"}, '*')
+                // closedDetail('/system/addTemplate')
             }
         },
     }

src/views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue

@@ -115,7 +115,8 @@
                     onOk() {
                         that.$api.stockManage.fetchReceiveConfirm(params).then(({data = [], code}) => {
                             if (code === 'SUCCESS') {
-                                closedDetail('/inStock/inStockManageDetail', '/Home/distributionWarehousing')
+                                window.top.postMessage({messageType:'THIRD_PAGECHANGE',name:`${this.routerParams.menuCode}`,source:"yesuan"}, '*')
+                                // closedDetail('/inStock/inStockManageDetail', '/Home/distributionWarehousing')
                             }
                         });
                     },

src/views/indexComponent/distributionWarehousing/components/distributionWarehousingDetail.vue

@@ -113,7 +113,8 @@
                 })
             },
             goBack() {
-                closedDetail('/inStock/inStockManageDetail', '/Home/distributionWarehousing')
+                window.top.postMessage({messageType:'THIRD_PAGECHANGE',name:`${this.routerParams.menuCode}`,source:"yesuan"}, '*')
+                // closedDetail('/inStock/inStockManageDetail', '/Home/distributionWarehousing')
             }
         },
     }

src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue

@@ -210,13 +210,17 @@
 
             },
             toDetail(record) {
-                let par = {
-                    ...record,
-                    menuId: this.menuId
-                }
-                this.$router.push({path: '/distributionWarehousing/detail', query: par})
+                let now_location = escape(process.env.VUE_APP_LOCATION+`distributionWarehousing/add?id=${record.id}&menuId=${this.menuId}&menuCode=${this.routerParams.menuName}`)
+                window.top.postMessage({messageType:'THIRD_PAGEADD',title:`查看详情`,url:now_location}, '*')
+                // let par = {
+                //     ...record,
+                //     menuId: this.menuId
+                // }
+                // this.$router.push({path: '/distributionWarehousing/detail', query: par})
             },
             toAdd(record) {
+                let now_location = escape(process.env.VUE_APP_LOCATION+`distributionWarehousing/add?id=${record.id}&menuId=${this.menuId}&menuCode=${this.routerParams.menuName}`)
+                window.top.postMessage({messageType:'THIRD_PAGEADD',title:`分配入库`,url:now_location}, '*')
                 let par = {
                     ...record,
                     menuId: this.menuId

src/views/indexComponent/folviteApply/folviteApply.vue

@@ -226,12 +226,14 @@
                 });
             },
             toDetail(record) {
-                let params = {
-                    id: record.id,
-                    routerFlag: 'update',
-                    menuId: this.menuId
-                }
-                this.$router.push({path: '/folviteDistribution/add', query: params})
+                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}, '*')
+                // let params = {
+                //     id: record.id,
+                //     routerFlag: 'update',
+                //     menuId: this.menuId
+                // }
+                // this.$router.push({path: '/folviteDistribution/add', query: params})
             }
         },
     }

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

@@ -661,13 +661,14 @@
 
             },
             goBack() {
-                if (this.routerParams.routerFlag == "update") {
-                    this.$router.push("/Home/folviteApply");
-                    closedDetail('/inStock/addMaterialDistribution', '/Home/folviteApply');
-                } else {
-                    this.$router.push("/Home/folviteDistribution");
-                    closedDetail('/inStock/addMaterialDistribution', '/Home/folviteDistribution')
-                }
+                window.top.postMessage({messageType:'THIRD_PAGECHANGE',name:`${this.routerParams.menuCode}`,source:"yesuan"}, '*')
+                // if (this.routerParams.routerFlag == "update") {
+                //     this.$router.push("/Home/folviteApply");
+                //     closedDetail('/inStock/addMaterialDistribution', '/Home/folviteApply');
+                // } else {
+                //     this.$router.push("/Home/folviteDistribution");
+                //     closedDetail('/inStock/addMaterialDistribution', '/Home/folviteDistribution')
+                // }
             }
         }
     }

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

@@ -218,8 +218,9 @@
                 })
             },
             goBack() {
-                this.$router.push("/Home/folviteDistribution");
-                closedDetail('/inStock/inStockManageDetail', '/Home/folviteDistribution')
+                window.top.postMessage({messageType:'THIRD_PAGECHANGE',name:`${this.routerParams.menuCode}`,source:"yesuan"}, '*')
+                // this.$router.push("/Home/folviteDistribution");
+                // closedDetail('/inStock/inStockManageDetail', '/Home/folviteDistribution')
             },
         },
     }

src/views/indexComponent/folviteDistribution/folviteDistribution.vue

@@ -253,14 +253,18 @@
             //     return window.parent.document.body
             // },
             toAdd() {
-                this.$router.push({path: '/folviteDistribution/add', query: {routerFlag: 'add',menuId: this.menuId}})
+                let now_location = escape(process.env.VUE_APP_LOCATION+`folviteDistribution/add?menuId=${this.menuId}&menuCode=${this.routerParams.menuName}&routerFlag=add`)
+                window.top.postMessage({messageType:'THIRD_PAGEADD',title:`发放登记`,url:now_location}, '*')
+                // this.$router.push({path: '/folviteDistribution/add', query: {routerFlag: 'add',menuId: this.menuId}})
             },
             toDetail(record) {
-                let par = {
-                    menuId: this.menuId,
-                    ...record
-                }
-                this.$router.push({path: '/folviteDistribution/detail', query: par})
+                let now_location = escape(process.env.VUE_APP_LOCATION+`folviteDistribution/detail?menuId=${this.menuId}&menuCode=${this.routerParams.menuName}&id=${record.id}&source=${record.source}`)
+                window.top.postMessage({messageType:'THIRD_PAGEADD',title:`查看详情`,url:now_location}, '*')
+                // let par = {
+                //     menuId: this.menuId,
+                //     ...record
+                // }
+                // this.$router.push({path: '/folviteDistribution/detail', query: par})
             },
             uploadConsentInfo(row) {
                 this.formData.id = row.id;

src/views/indexComponent/inStockManage/components/addMaterialDistribution.vue

@@ -24,7 +24,7 @@
                                 </a-form-model-item>
                             </a-col>
                             <a-col :span="8">
-                                <a-form-model-item label="联系电话" prop="sendPhone">
+                                <a-form-model-item label="发货人联系电话" prop="sendPhone">
                                     <a-input placeholder="请填写发货人电话" v-model="formData.sendPhone"></a-input>
                                 </a-form-model-item>
                             </a-col>
@@ -56,7 +56,7 @@
                                 </a-form-model-item>
                             </a-col>
                             <a-col :span="8">
-                                <a-form-model-item label="联系电话" prop="receivePhone">
+                                <a-form-model-item label="收货人联系电话" prop="receivePhone">
                                     <a-input placeholder="请填写收货人电话" v-model="formData.receivePhone"></a-input>
                                 </a-form-model-item>
                             </a-col>
@@ -133,7 +133,7 @@
                     sendUnitId: undefined,
                     sendUnitName: undefined,
                     receiveUnitId: undefined,
-                    sendDate: moment(new Date()).format('yyyy-MM-DD'),
+                    sendDate: moment(new Date()).format('YYYY-MM-DD'),
                     sendContact: undefined,
                     sendPhone: undefined,
                     receivePhone: undefined,
@@ -183,6 +183,7 @@
             }
         },
         created() {
+            this.routerParams = this.$route.query
             this.getSelectedMedical()
             this.formData.sendUnitId = this.unitInfo.unitId;
             this.formData.sendUnitName = this.unitInfo.unitName;
@@ -229,12 +230,12 @@
                             let params = {}
                             let reviceUnitName = this.childUnitList.filter(item => item.id == this.formData.receiveUnitId)[0].unitName;
                             let treeNodeId = this.childUnitList.filter(item => item.id == this.formData.receiveUnitId)[0].treeNodeId;
-                            let unitInfo = JSON.parse(window.sessionStorage.setItem('unitInfo'));
+                            let unitInfo = JSON.parse(window.sessionStorage.getItem('unitInfo'));
                             params = {
                                 ...this.formData,
                                 receiveNodeId: treeNodeId,
                                 receiveNodeName: reviceUnitName,
-                                sendDate: moment(this.formData.sendDate).format('yyyy-MM-DD'),
+                                sendDate: moment(this.formData.sendDate).format('YYYY-MM-DD'),
                                 receiveUnitName: reviceUnitName,
                                 sendUnitName: unitInfo.unitName
                             };
@@ -261,7 +262,8 @@
                 });
             },
             goBack() {
-                closedDetail('/inStock/addMaterialDistribution', '/Home/inStock')
+                window.top.postMessage({messageType:'THIRD_PAGECHANGE',name:`${this.routerParams.menuCode}`,source:"yesuan"}, '*')
+                // closedDetail('/inStock/addMaterialDistribution', '/Home/inStock')
             }
         }
     }

src/views/indexComponent/inStockManage/components/addStock.vue

@@ -242,7 +242,8 @@
             },
 
             goBack() {
-                closedDetail('/inStock/add', '/Home/inStock')
+                window.top.postMessage({messageType:'THIRD_PAGECHANGE',name:`${this.routerParams.menuCode}`,source:"yesuan"}, '*')
+                // closedDetail('/inStock/add', '/Home/inStock')
             }
         },
     }

src/views/indexComponent/inStockManage/components/inStockManageDetail.vue

@@ -71,7 +71,8 @@
                 })
             },
             goBack() {
-                closedDetail('/inStock/inStockManageDetail', '/Home/inStock')
+                window.top.postMessage({messageType:'THIRD_PAGECHANGE',name:`${this.routerParams.menuCode}`,source:"yesuan"}, '*')
+                // closedDetail('/inStock/inStockManageDetail', '/Home/inStock')
             }
         },
     }

src/views/indexComponent/inStockManage/inStockManage.vue

@@ -34,11 +34,12 @@
         </a-form>
          <div style="display: flex;justify-content: space-between;align-items: center">
         <div style="margin-bottom: 10px">
-            <a-button type="primary" class="search_btn btn_space " @click="openModal" v-if="unitInfo.level==3">
+           <!-- v-if="unitInfo.level==3"-->
+            <a-button type="primary" class="search_btn btn_space " @click="openModal" >
                 库存录入
             </a-button>
+            <!--v-if="unitInfo.level==3||unitInfo.level==4"-->
             <a-button type="primary" class="search_btn btn_space" :disabled="selectedRowKeys.length <= 0"
-                      v-if="unitInfo.level==3||unitInfo.level==4"
                       @click="toAdd">调拨分配
             </a-button>
            <!-- <a-button type="primary" class="search_btn btn_space">导出Excel</a-button>-->
@@ -112,6 +113,16 @@
     import {isNotBlank, isEmptyParams, getEnumByFlag} from "../../utils/common";
     import dateRangePicker from '../../components/dateRangePicker'
     import moment from 'moment'
+    // let vm = this
+    // function postMessageInfo (event) {
+    //     const data = event.data;
+    //     let nowType = data.messageType
+    //     if(nowType=="REFRESH") {
+    //         vm.searchList()
+    //     }
+    // }
+    // window.addEventListener('message', postMessageInfo);
+    // window.removeEventListener('message', postMessageInfo)
 
     const columns = [
         {
@@ -315,14 +326,20 @@
             },
             // 库存录入按钮
             openModal() {
-                let par = {menuId: this.menuId}
-                this.$router.push({path: '/inStock/add', query: par})
+                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}, '*')
+                // let par = {menuId: this.menuId}
+                // this.$router.push({path: '/inStock/add', query: par})
             },
             toAdd() {
-                this.$router.push({path: '/inStock/addMaterialDistribution', query: {selected: this.selectedRowKeys, menuId: this.menuId}})
+                let now_location = escape(process.env.VUE_APP_LOCATION+`inStock/addMaterialDistribution?selected=${this.selectedRowKeys}&menuId=${this.menuId}&menuCode=${this.routerParams.menuName}`)
+                window.top.postMessage({messageType:'THIRD_PAGEADD',title:`调拨分配`,url:now_location}, '*')
+                // this.$router.push({path: '/inStock/addMaterialDistribution', query: {selected: this.selectedRowKeys, menuId: this.menuId}})
             },
             toDetail(record) {
-                this.$router.push({path: '/inStock/inStockManageDetail', query: {id: record.id, menuId: this.menuId}})
+                let now_location = escape(process.env.VUE_APP_LOCATION+`inStock/inStockManageDetail?id=${record.id}&menuId=${this.menuId}&menuCode=${this.routerParams.menuName}`)
+                window.top.postMessage({messageType:'THIRD_PAGEADD',title:`查看详情`,url:now_location}, '*')
+                // this.$router.push({path: '/inStock/inStockManageDetail', query: {id: record.id, menuId: this.menuId}})
             }
         },
     }

src/views/indexComponent/stockTransfer/stockTransfer.vue

@@ -2,7 +2,7 @@
     <div class="stockTransfer">
         <a-form layout="inline" class="search_form">
             <a-form-item label="供应商名称">
-                <a-select v-model="searchForm.supplierId" placeholder="请选择" style="width: 250px">
+                <a-select v-model="searchForm.supplierId" placeholder="请选择" style="width: 200px">
                     <a-select-option value="">全部</a-select-option>
                     <a-select-option v-for="item in allSupplyInfo" :key="item.id" :value="item.id">
                         {{item.supplierName}}
@@ -10,7 +10,7 @@
                 </a-select>
             </a-form-item>
             <a-form-item label="品牌">
-                <a-select v-model="searchForm.brandId" placeholder="请选择" style="width: 250px">
+                <a-select v-model="searchForm.brandId" placeholder="请选择" style="width: 200px">
                     <a-select-option value="">全部</a-select-option>
                     <a-select-option v-for="item in brandList" :key="item.enumValue" :value="item.enumValue">
                         {{item.enumName}}
@@ -18,7 +18,7 @@
                 </a-select>
             </a-form-item>
             <a-form-item label="类型">
-                <a-select v-model="searchForm.stockType" placeholder="请选择" style="width: 250px">
+                <a-select v-model="searchForm.stockType" placeholder="请选择" style="width: 100px">
                     <a-select-option value="">全部</a-select-option>
                     <a-select-option v-for="item in stockTypeList" :key="item.enumValue" :value="item.enumValue">
                         {{item.enumName}}
@@ -26,16 +26,19 @@
                 </a-select>
             </a-form-item>
             <a-form-item label="出库/入库日期">
-                <dateRangePicker :date.sync="searchForm.date"></dateRangePicker>
+                <dateRangePicker :date.sync="searchForm.date" style="width: 250px"></dateRangePicker>
             </a-form-item>
+<!--            <a-form-item>-->
+            <div style="float: right;margin-bottom: 10px">
             <a-button type="primary" class="search_btn" icon="search" @click="searchList">搜索</a-button>
             <a-button class="search_btn ant-table-btn" style="margin-left: 10px" icon="sync" @click="restSearchForm">清空</a-button>
-<!--            <a-button type="primary" class="search_btn" icon="download" style="float: right" @click="downloadExcel">-->
+            </div>
+                <!--            </a-form-item>-->
+                <!--            <a-button type="primary" class="search_btn" icon="download" style="float: right" @click="downloadExcel">-->
 <!--                导出Excel-->
 <!--            </a-button>-->
         </a-form>
         <div style="clear: both"></div>
-        <div style="clear: both"></div>
         <a-table :dataSource="tableData"
                  :columns="columns"
                  rowKey="id"

src/views/indexComponent/supplyManage/components/addSupply.vue

@@ -212,7 +212,8 @@
                 });
             },
             goBack() {
-                closedDetail('/supplyManage/add', '/Home/supplyManage')
+                window.top.postMessage({messageType:'THIRD_PAGECHANGE',name:`${this.routerParams.menuCode}`,source:"yesuan"}, '*')
+                // closedDetail('/supplyManage/add', '/Home/supplyManage')
             }
         },
     }

src/views/indexComponent/supplyManage/supplyManage.vue

@@ -232,7 +232,9 @@
                 });
             },
             updateSupply(record) {
-                this.$router.push({path: '/supplyManage/add', query: {modeType: "update", id: record.id, menuId: this.menuId}});
+                let now_location = escape(process.env.VUE_APP_LOCATION+`supplyManage/add?modeType=update&menuId=${this.menuId}&menuCode=${this.routerParams.menuName}&id=${record.id}`)
+                window.top.postMessage({messageType:'THIRD_PAGEADD',title:`修改供应商`,url:now_location}, '*')
+                // this.$router.push({path: '/supplyManage/add', query: {modeType: "update", id: record.id, menuId: this.menuId}});
             }
         },
     }

src/views/utils/common.js

@@ -215,4 +215,3 @@ export const GetUserInfoByCardDevice = () => {
     })
 };
 
-

src/views/utils/directives/int.js

@@ -20,7 +20,6 @@ Vue.directive('toInt', {
             }
         });
         function checkedfun(el, maxNum, notNum) {
-            debugger
             if (maxNum && el.value > maxNum) {
                 el.value = maxNum
                 el.dispatchEvent(new Event("input"));//调用input事件使vue v-model绑定更新