ERP_override.git

			@@ -24,6 +24,10 @@
			};

			const saveToDatabase = () => {
			if (settings.server.haveOptimaMark === '1' && settings.server.haveQMark === '1') {
			ElMessage.warning('是否生成OPTIMA打标信息和是否生成速刻打标信息不能同时为是');
			return;
			}
			if (settings.server.printLayouts === '0' && settings.server.printReport === '0') {
			ElMessage.warning('版图和报告不能同时不打印，请至少选择一项');
			return;

			@@ -96,8 +96,8 @@
			{code: 'openProject', name: '打开工程', prefixIcon: 'vxe-icon-folder-open'},
			{code: 'compute', name: '模拟计算', prefixIcon: 'vxe-icon-subtable'},
			//{code: 'optimizeTypography', name: '优化排版', prefixIcon: 'vxe-icon-menu'},
			{code: 'production', name: '允许生产', prefixIcon: 'vxe-icon-square-checked'},
			{code: 'novisible', name: '生产不可见', prefixIcon: 'vxe-icon-eye-fill-close'},
			{code: 'production', name: '确认生产', prefixIcon: 'vxe-icon-square-checked'},
			{code: 'novisible', name: '取消生产', prefixIcon: 'vxe-icon-eye-fill-close'},
			{code: 'copyproject', name: '复刻工程', prefixIcon: 'vxe-icon-copy'},
			{code: 'undoOptimize', name: '撤销优化', prefixIcon: 'vxe-icon-error-circle-fill'},
			{code: 'undoCompute', name: '撤销模拟计算', prefixIcon: 'vxe-icon-error-circle-fill'},

	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeParms.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史