ERP_override.git

			@@ -80,7 +80,7 @@
			maxHeight: { type: Number, default: 3000 },

			fit: { type: String, default: 'contain' },

			marginX: { type: String, default: '30px' },
			dialogTitle: { type: String, default: '设置图片尺寸' },
			showHint: { type: Boolean, default: true }
			})
			@@ -126,10 +126,12 @@
			return {
			width: `${w}px`,
			height: `${h}px`,
			margin: props.margin,
			marginLeft: props.marginX,
			marginRight: props.marginX
			}
			}


			const openSizeDialog = (img, index) => {
			const key = getKey(img, index)
			activeKey.value = key

			@@ -325,6 +325,9 @@
			{field: 'process_id',width: 150, title: t('processCard.processId'),filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged},
			{field: 'technology_number', width: 110,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged},
			{field: 'print_status', width: 120,title: t('processCard.numberTimesProcessCardPrinted')},
			{field: 'print_number', width: 110,title: t('processCard.numberLabelPrintingOperations')},
			{field: 'order_number', width: 100,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
			@@ -333,10 +336,6 @@
			// {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
			// slots: {filter: 'num1_filter'},
			// filterMethod: filterChanged},
			{field: 'technology_number', width: 110,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged},

			{field: 'quantity', width: 90,title: t('order.quantity')},
			{field: 'grossArea', width: 90,title: t('order.area')},
			{field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},

	north-glass-erp/northglass-erp/src/components/ImageSizeEditor.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史