ERP_override.git

			@@ -639,6 +639,11 @@
			if (!hiprint.hiwebSocket.opened) {
			hiprint.hiwebSocket.setHost("http://localhost:17521")
			}
			//获取打印机列表
			/*hiprint.refreshPrinterList((list) => {
			console.log('refreshPrinterList')
			console.log(list)
			});*/
			};

			@@ -1,5 +1,10 @@

			import { createI18n} from 'vue-i18n'
			import { VxeUI } from 'vxe-table'
			import zhCN from 'vxe-table/lib/locale/lang/zh-CN'
			import enUS from 'vxe-table/lib/locale/lang/en-US'
			//import zhCN from 'vxe-table/lib/language/zh-CN'

			import zh from "./zh"
			import en from "./en"
			import ru from "./ru"
			@@ -16,5 +21,7 @@
			globalInjection: true, // 全局注册$t方法
			messages
			})

			VxeUI.setI18n('zh-CN', zhCN)
			VxeUI.setI18n('en-US', enUS)
			VxeUI.setLanguage(localStorage.getItem('lang')==='en-US' ? 'en-US' : 'zh-CN')
			export default i18n

			@@ -10,6 +10,7 @@
			import userOrderInfo from '@/stores/sd/order/orderInfo'
			import { useI18n } from 'vue-i18n'
			import i18n from "@/lang/index"
			import { VxeUI } from 'vxe-table'
			//语言获取
			const { t } = useI18n()
			let language = ref(localStorage.getItem('lang') \|\| 'zh-CN')

			@@ -335,6 +335,7 @@
			}

			function filterChanged(column){
			//console.log(column)
			gridOptions.loading=true
			//筛选条件发生变化条件发生变化
			let value = column.datas[0]!=undefined?column.datas[0]:''
			@@ -561,14 +562,20 @@
			<template #num1_filter="{ column, $panel }">
			<div>
			<div v-for="(option, index) in column.filters" :key="index">
			<input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
			<input
			v-model="option.data"
			@keyup.enter.native="$panel.confirmFilter()"
			@input="changeFilterEvent($event, option, $panel)"/>
			</div>
			</div>
			</template>
			<template #num2_filter="{ column, $panel }">
			<div>
			<div v-for="(option, index) in column.filters" :key="index">
			<vxe-select v-model="option.data" @change="changeFilterEvent($event, option, $panel)" :placeholder="$t('processCard.pleaseSelect')">
			<vxe-select
			v-model="option.data"
			@change="changeFilterEvent($event, option, $panel)"
			:placeholder="$t('processCard.pleaseSelect')">
			<vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
			<vxe-option value="1" :label="$t('basicData.partiallySelected')"></vxe-option>
			<vxe-option value="2" :label="$t('basicData.selected')"></vxe-option>

	north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/lang/index.js	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/LoginView.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史