ERP_override.git

			@@ -139,15 +139,15 @@
			{field: 'goodsQuantity',width:120, title: t('searchOrder.inventoryNum'), sortable: true},
			{field: 'area',width:120, title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'money',width:120, title: t('order.money'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'createTime',width:120, title: t('basicData.reportData'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'updateTime',width:120, title: t('productStock.approvedDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'createTime',width:120, title: t('basicData.reportData'), sortable: true},
			{field: 'updateTime',width:120, title: t('productStock.approvedDate'), sortable: true},
			{field: 'packType',width:120, title: t('order.packType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'orderType',width:120, title: t('order.orderType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'salesman',width:120, title: t('order.salesman'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'creator',width:120, title: t('product.creator'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'verifier',width:120, title: t('basicData.review'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'perimeter',width:120, title: t('searchOrder.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'deliveryDate',width:120, title: t('order.deliveryDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'deliveryDate',width:120, title: t('order.deliveryDate'), sortable: true},
			{field: 'customerBatch',width:120, title: t('order.customerBatch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

			//{field: '14',width:120, title: '备注',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

			@@ -255,13 +255,11 @@
			@ApiOperation("手机扫码玻璃信息")
			@PostMapping("/scannerGlassInfo/{projectNo}")
			public Result scannerGlassInfo(@PathVariable String projectNo) {
			System.out.println("123123");
			return Result.seccess(orderService.scannerGlassInfo(projectNo));
			}

			@PostMapping("/test")
			public Result scannerGlassInfo() {
			System.out.println("123123");
			return Result.seccess(null);
			}

	north-glass-erp/northglass-erp/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -5,7 +5,7 @@
			<link rel="icon" href="/favicon.ico">
			<link rel="stylesheet" type="text/css" media="print" href="/print-lock.css">
			<meta name="viewport" content="width=device-width, initial-scale=1.0">
			<title>北玻</title>
			<title>北玻ERP</title>
			</head>
			<body>
			<div id="app"></div>