From 7ccac952b85611c93f5b0752ddfcea60d2548fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=99=93=E9=B9=8F?= <jialanbaiyue@163.com>
Date: Sat, 11 Oct 2025 15:16:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 .env.production                               |  2 +-
 src/App.vue                                   |  2 +-
 .../componentPrinting.vue                     | 25 +++++++++++--------
 src/views/mssPurchaseOrder/selectedData.vue   |  1 -
 vite.config.ts                                |  2 +-
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.env.development b/.env.development
index 236a36a..44fa216 100644
--- a/.env.development
+++ b/.env.development
@@ -8,4 +8,4 @@ VITE_API_File1 = https://maxcessth.gatedge.cn
 
 
 VITE_API_File = https://maxcessth.gatedge.cn
-VITE_API_URL = http://58.252.252.77:91
\ No newline at end of file
+VITE_API_URL = https://maxcessth.gatedge.cn:91
\ No newline at end of file
diff --git a/.env.production b/.env.production
index fae1a64..45c212b 100644
--- a/.env.production
+++ b/.env.production
@@ -7,4 +7,4 @@ VITE_API_URL2 = https://maxcessth.gatedge.cn:91
 VITE_API_File1 = https://maxcessth.gatedge.cn
 
 VITE_API_File = https://maxcess.gatedge.cn
-VITE_API_URL = http://58.252.252.77:90
\ No newline at end of file
+VITE_API_URL = https://maxcess.gatedge.cn:91
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index a2f5ef7..58d314e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup lang="ts" name="app">
-import { defineAsyncComponent, computed, ref, onBeforeMount, onMounted, onUnmounted, nextTick, watch, getCurrentInstance } from 'vue';
+import { defineAsyncComponent, computed, ref, onBeforeMount, onMounted, onUnmounted, nextTick, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
diff --git a/src/views/materialReceiptNotice/componentPrinting.vue b/src/views/materialReceiptNotice/componentPrinting.vue
index 764b0b2..fe59d42 100644
--- a/src/views/materialReceiptNotice/componentPrinting.vue
+++ b/src/views/materialReceiptNotice/componentPrinting.vue
@@ -47,12 +47,12 @@
 							<template #prepend>{{ t('message.tiaoma.grn') }}</template>
 						</el-input>
 					</div>
-					<div class="selectItem">
-						<el-select v-model="state.printSelection" clearable :placeholder="t('message.tiaoma.qxzdymb')" size="default" style="width: 150px">
-							<el-option :label="t('message.tiaoma.zhuhai')" value="0" />
-							<el-option :label="t('message.tiaoma.taiguo')" value="1" />
-						</el-select>
-					</div>
+<!--					<div class="selectItem">-->
+<!--						<el-select v-model="state.printSelection" clearable :placeholder="t('message.tiaoma.qxzdymb')" size="default" style="width: 150px">-->
+<!--							<el-option :label="t('message.tiaoma.zhuhai')" value="0" />-->
+<!--							<el-option :label="t('message.tiaoma.taiguo')" value="1" />-->
+<!--						</el-select>-->
+<!--					</div>-->
 					<el-button type="primary" size="default" @click="printCheckAllFun">{{ t('message.tiaoma.zddy') }}</el-button>
 					<el-button type="primary" size="default" @click="printCheckAllFun">{{ t('message.tiaoma.tjdy') }}</el-button>
 					<el-button type="primary" size="default" @click="defaultPrinterFun">{{ t('message.tiaoma.xzdyj') }} </el-button>
@@ -70,6 +70,7 @@ import { listApi } from '/@/api/list';
 import barCode from './barCode.vue';
 import { ElMessage, ElMessageBox, } from 'element-plus';
 import { getLodop } from '../../utils/LodopFuncs.js';
+import {Local} from "/@/utils/storage";
 // const LODOP = window.LODOP;
 const barCodeRef = ref();
 const LODOP = ref();
@@ -92,6 +93,7 @@ const state: any = reactive({
 	printerList: [],
 	timer: null,
 	allSetTime: null,
+  userInfo: {}
 });
 
 const expandOption = computed(() => ({
@@ -157,13 +159,14 @@ onMounted(() => {
 	setTimeout(() => {
 		LODOP.value = getLodop();
 	}, 1000);
+  state.userInfo = Local.get('setUserInfo');
 });
 //打印校验
 const printVerification = () => {
-	if (state.printSelection === '') {
-		ElMessage.warning(t('message.tiaoma.qxzdymb'));
-		return false;
-	}
+	// if (state.printSelection === '') {
+	// 	ElMessage.warning(t('message.tiaoma.qxzdymb'));
+	// 	return false;
+	// }
 	if (state.timer !== null) {
 		ElMessage.warning(t('message.tiaoma.dyjzzgzz'));
 		return false;
@@ -244,7 +247,7 @@ const dataExtractFun = (list: any = []) => {
 	state.printState = '1';
 	let mainState = list.length === 1;
 	state.timer = setInterval(() => {
-		if (state.printSelection === '0') {
+		if (String(state.userInfo.ifForeign) === '0') {
 			LODOP.value.PRINT_INITA(0, 0, 0, 0, 'L4');
 			LODOP.value.SET_PRINT_PAGESIZE(1, 1000, 500, '');
 			AddPrintContentZhuhai(list[stepCounter], mainState);
diff --git a/src/views/mssPurchaseOrder/selectedData.vue b/src/views/mssPurchaseOrder/selectedData.vue
index 5683248..117779b 100644
--- a/src/views/mssPurchaseOrder/selectedData.vue
+++ b/src/views/mssPurchaseOrder/selectedData.vue
@@ -1,6 +1,5 @@
 <template>
 	<el-dialog :model-value="props.showes" @close="closeFun" width="90%">
-
 		<avue-crud ref="crudRef" :data="state.data" :option="tableOption">
 			<template #fSupplierLot="{ row }">
 				<div style="display: flex; align-items: center; justify-content: center">
diff --git a/vite.config.ts b/vite.config.ts
index b022ff8..3286c8d 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -29,7 +29,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 			hmr: true,
 			proxy: {
 				'/api': {
-					target: 'https://58.252.252.77:91',
+					target: 'https://maxcessth.gatedge.cn:91',
 					ws: true,
 					changeOrigin: true,
 					rewrite: (path) => path.replace(/^\/api/, ''),