From 60480a72558b3d64e483dcf89457fde4f3c1c31f Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 20 一月 2026 15:32:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
.env.development | 2
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue | 22 +++++++
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 22 +++++++
.env.production | 8 +-
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 22 +++++++
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue | 23 +++++--
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue | 22 +++++++
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue | 22 +++++++
8 files changed, 125 insertions(+), 18 deletions(-)
diff --git a/.env.development b/.env.development
index 8f619ba..74294f0 100644
--- a/.env.development
+++ b/.env.development
@@ -10,7 +10,7 @@
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
#閿﹂殕
-# VUE_APP_BASE_API = 'http://192.168.1.11/API/'
+VUE_APP_BASE_API_INNER = 'http://192.168.1.11/API/'
VUE_APP_BASE_API = http://61.174.29.234:8880/API/
#鏉滆春
# VUE_APP_BASE_API = http://localhost:8082/API/
diff --git a/.env.production b/.env.production
index 88d9951..6b9d2a0 100644
--- a/.env.production
+++ b/.env.production
@@ -5,11 +5,11 @@
ENV = 'production'
# 瀹佹尝 鍥涚淮灏�
-# VUE_APP_BASE_API = http://192.168.0.236:9010/API/
-# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
+VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
+VUE_APP_BASE_API = http://220.189.218.155:9010/API/
# 浣欏 閿﹂殕 鏅鸿兘瀹跺眳
-# VUE_APP_BASE_API = http://192.168.1.11/API/
-VUE_APP_BASE_API = http://61.174.29.234:8880/API/
+# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
+# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/鐢熶骇鐜
# VUE_APP_BASE_API = http://47.96.97.237/API/
#鏉滆春
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index 98320ee..70d9def 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -184,6 +184,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -265,6 +266,8 @@
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
+ <!-- 瀹瑰櫒搴撳瓨 -->
+ <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
</div>
</template>
@@ -278,11 +281,12 @@
import GyCustomer from '@/views/GyCustomer'
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import ICInventoryMould from '@/views/component/ICInventory_Mould' //瀹瑰櫒搴撳瓨缁勪欢
import moment from 'moment';
export default {
name: 'Sc_MouldInRequestBillEdit',
- components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ICInventoryMould },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -322,6 +326,7 @@
organizationList: [],//缁勭粐鍒楄〃
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+ ICInventoryMouldShow:false, //瀹瑰櫒搴撳瓨缁勪欢鏄剧ず鏍囪
HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
@@ -889,6 +894,21 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
+
+ //#region 鏌ョ湅瀹瑰櫒搴撳瓨
+ get_ICInventoryMould(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ var index = zbSelForm.index-1;
+ this.ICInventoryMouldShow = true
+ this.$nextTick(() => {
+ this.$refs.ICInventoryMould.open(this.editData[index]);
+ })
+ }
+ },
+ //#endregion
+
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index 9895387..855a371 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -201,6 +201,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -315,6 +316,8 @@
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
+ <!-- 瀹瑰櫒搴撳瓨 -->
+ <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
</div>
</template>
@@ -328,11 +331,12 @@
import GyCustomer from '@/views/GyCustomer'
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import ICInventoryMould from '@/views/component/ICInventory_Mould' //瀹瑰櫒搴撳瓨缁勪欢
import moment from 'moment';
export default {
name: 'Sc_MouldMoveStockRequestBillEdit',
- components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ICInventoryMould},
props: {
OperationType: { type: Number, },//鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫銆�3澶嶅埗銆�4涓嬫帹锛�
linterid: { type: Number, },
@@ -372,6 +376,7 @@
organizationList: [],//缁勭粐鍒楄〃
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+ ICInventoryMouldShow:false, //瀹瑰櫒搴撳瓨缁勪欢鏄剧ず鏍囪
HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
@@ -989,6 +994,21 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
+
+ //#region 鏌ョ湅瀹瑰櫒搴撳瓨
+ get_ICInventoryMould(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ var index = zbSelForm.index-1;
+ this.ICInventoryMouldShow = true
+ this.$nextTick(() => {
+ this.$refs.ICInventoryMould.open(this.editData[index]);
+ })
+ }
+ },
+ //#endregion
+
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index 1c3b982..96119ca 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -201,6 +201,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -288,6 +289,8 @@
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
+ <!-- 瀹瑰櫒搴撳瓨 -->
+ <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
</div>
</template>
@@ -302,11 +305,12 @@
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import ScICMOBillList from '@/views/ICMO/ScICMOBillList.vue'
+import ICInventoryMould from '@/views/component/ICInventory_Mould' //瀹瑰櫒搴撳瓨缁勪欢
import moment from 'moment';
export default {
name: 'Sc_MouldOutRequestBillEdit',
- components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScICMOBillList },
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScICMOBillList,ICInventoryMould },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -348,6 +352,7 @@
organizationList: [],//缁勭粐鍒楄〃
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+ ICInventoryMouldShow:false, //瀹瑰櫒搴撳瓨缁勪欢鏄剧ず鏍囪
HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
@@ -982,6 +987,21 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
+
+ //#region 鏌ョ湅瀹瑰櫒搴撳瓨
+ get_ICInventoryMould(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ var index = zbSelForm.index-1;
+ this.ICInventoryMouldShow = true
+ this.$nextTick(() => {
+ this.$refs.ICInventoryMould.open(this.editData[index]);
+ })
+ }
+ },
+ //#endregion
+
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index a8851ce..30f927c 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -206,6 +206,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -361,6 +362,8 @@
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
+ <!-- 瀹瑰櫒搴撳瓨 -->
+ <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
</div>
</template>
@@ -375,11 +378,12 @@
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import scMouldIn from '@/views/scMould/warehouse/component/Sc_MouldInRequestBill.vue'
+import ICInventoryMould from '@/views/component/ICInventory_Mould' //瀹瑰櫒搴撳瓨缁勪欢
import moment from 'moment';
export default {
name: 'Sc_MouldProdBackBillEdit',
- components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,scMouldIn },
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,scMouldIn,ICInventoryMould },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -422,6 +426,7 @@
ifOrganizationEdit: false,
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ ICInventoryMouldShow:false, //瀹瑰櫒搴撳瓨缁勪欢鏄剧ず鏍囪
HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
@@ -1133,6 +1138,21 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
+
+ //#region 鏌ョ湅瀹瑰櫒搴撳瓨
+ get_ICInventoryMould(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ var index = zbSelForm.index-1;
+ this.ICInventoryMouldShow = true
+ this.$nextTick(() => {
+ this.$refs.ICInventoryMould.open(this.editData[index]);
+ })
+ }
+ },
+ //#endregion
+
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index b03464f..a88e6fe 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -223,6 +223,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -400,6 +401,8 @@
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
+ <!-- 瀹瑰櫒搴撳瓨 -->
+ <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
</div>
</template>
@@ -414,11 +417,12 @@
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import ScMouldMove from '@/views/scMould/warehouse/component/Sc_MouldMoveStockRequestBill.vue'
+import ICInventoryMould from '@/views/component/ICInventory_Mould' //瀹瑰櫒搴撳瓨缁勪欢
import moment from 'moment';
export default {
name: 'Sc_MouldProdMoveBillEdit',
- components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScMouldMove },
+ components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScMouldMove,ICInventoryMould },
props: {
OperationType: { type: Number, },//锛�1鏂板銆�2缂栬緫銆�3澶嶅埗銆�4涓嬫帹锛�
linterid: { type: Number, },
@@ -462,6 +466,7 @@
ifOrganizationEdit: false,
subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛�1鏂板銆�2缂栬緫銆�3澶嶅埗銆�4涓嬫帹锛�
+ ICInventoryMouldShow:false, //瀹瑰櫒搴撳瓨缁勪欢鏄剧ず鏍囪
HInterID: 0,
baseURL: process.env.VUE_APP_BASE_API,
checkedSysZb: [],
@@ -1210,6 +1215,21 @@
this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
},
+
+ //#region 鏌ョ湅瀹瑰櫒搴撳瓨
+ get_ICInventoryMould(zbSelForm) {
+ if (!this.zbIndex) {
+ this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+ } else {
+ var index = zbSelForm.index-1;
+ this.ICInventoryMouldShow = true
+ this.$nextTick(() => {
+ this.$refs.ICInventoryMould.open(this.editData[index]);
+ })
+ }
+ },
+ //#endregion
+
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
index 25fc7de..694dd7d 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
@@ -291,13 +291,13 @@
},
async created() {
await this.loging(); //鑷姩鐧诲綍
- this.judgeIsLoging(); //鍒ゆ柇鏄惁鐧诲綍锛屾湭鐧诲綍鍒欒烦杞洖鐧诲綍椤甸潰
+ await this.judgeIsLoging(); //鍒ゆ柇鏄惁鐧诲綍锛屾湭鐧诲綍鍒欒烦杞洖鐧诲綍椤甸潰
await this.get_OrganizationList(); //椤甸潰鍒濆鍖� 鑾峰彇缁勭粐涓嬫媺鍒楄〃鏁版嵁
await this.initPageData(); //椤甸潰鍒濆鍖�
},
methods: {
//#region 鍒ゆ柇鏄惁鐧诲綍锛屾湭鐧诲綍鍒欒烦杞洖鐧诲綍椤甸潰
- judgeIsLoging(){
+ async judgeIsLoging(){
if (sessionStorage["login"] != "login") {
this.$modal.msgError("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛侊紒");
this.$router.push({ path: "/" }).catch(() => { })
@@ -306,7 +306,7 @@
//#endregion
//#region 椤甸潰鍒濆鍖�
- initPageData(){
+ async initPageData(){
var params = this.get_UrlVars();
var OperationType = params[params[0]]; //鎿嶄綔绫诲瀷
@@ -729,11 +729,11 @@
if (HOrgID == 0) {
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- if (sessionStorage.login != "login") {
- this.$modal.msgError("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�!");
- this.$router.push({ path: "/" }).catch(() => { })
- }
- return;
+ // if (sessionStorage.login != "login") {
+ // this.$modal.msgError("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�!");
+ // this.$router.push({ path: "/" }).catch(() => { })
+ // }
+ // return;
}
var sql_getHOrgName = "select HName from Xt_Organizations where HItemID = " + HOrgID;
@@ -763,6 +763,8 @@
this.$router.push({ path: "/" }).catch(() => { })
});
+
+ // 鍐欏叆sessionStorage 闇�瑕佹椂闂达紝鍚庣画鎿嶄綔闇�瑕佺瓑寰� 鍐欏叆sessionStorage瀹屾垚鍚庡啀鎵ц
var sql_login = "select * from h_v_Gy_Czygl_Login where Czymc = '" + HUserName + "'";
axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
params: {
@@ -819,6 +821,11 @@
sessionStorage["Organization"] = HOrgName;
sessionStorage["HTranSlate"] = "1";
sessionStorage["HAutoLogin"] = "1";
+
+ // 娣诲姞涓�涓欢鏃讹紝淇濊瘉鍐欏叆sessionStorage瀹屾垚鍚庡啀璋冪敤鍚庣画涓氬姟浠ｇ爜
+ setTimeout(() => {
+
+ }, 1000);
} else {
this.$modal.msgError("鍔犺浇澶辫触锛侊紒璐﹀彿涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳缁存姢璐﹀彿淇℃伅锛侊紒");
this.$router.push({ path: "/" }).catch(() => { });
--
Gitblit v1.9.1