ERP_override.git

			@@ -154,10 +154,14 @@
			titleUploadData.value=deepClone(res.data.emit)
			titleUploadData.value.customerId=titleUploadData.value.customerName
			titleUploadData.value.emitId=emitId
			produceList = deepClone(res.data.data)
			if(titleUploadData.value.state>0){
			gridOptions.toolbarConfig.buttons[0].disabled = true
			produceList.forEach(item=>{
			item.availableQuantity=item.availableQuantity-item.quantity
			})
			}
			produceList = deepClone(res.data.data)

			xGrid.value.loadData(produceList)
			gridOptions.loading=false

			@@ -129,13 +129,9 @@
			{ type: 'checkbox',fixed:"left", title: t('basicData.check'), width: '80' },
			{ type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
			{field: 'quantity', width: '120',title: t('finishedGlassShelf.availableQuantity'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
			{field: 'price',width: '100', title: t('order.price'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
			{field: 'unit', width: '100',title: t('ingredients.unit'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
			{field: 'maxWeight', width: '100',title: t('finishedGlassShelf.maxWeight'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
			{field: 'maxWidth',width: '100', title: t('finishedGlassShelf.maxWidth'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
			{field: 'maxHeight',width: '100', title: t('finishedGlassShelf.maxHeight'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
			{field: 'remarks',width: '100', title: t('basicData.remarks'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
			{field: 'createTime',width: '100', title: t('basicData.creationTime'), sortable: true},
			]

			let arr2 = [

			@@ -334,11 +334,11 @@

			<select id="getSelectFinishedGlassShelfWithdrawDetailsBywithdrawId" >
			select
			fgw.information_id as informationId,
			fgw.emit_id as emitId,
			fgw.emit_number as emitNumber,
			fgw.glass_shelf_number as glassShelfNumber,
			fgw.glass_shelf_name as glassShelfName,
			fgw.max_weight as maxWeight,
			fgw.max_width as maxWidth,
			fgw.max_height as maxHeight,
			fgw.quantity,
			fge.quantity-fge.withdraw_quantity+fgw.quantity as quantity2,
			fgw.unit,

	north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelfEmit.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/FinishedGlassShelf.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史