~admin/ERP_override.git

			@@ -20,7 +20,7 @@
			let flowData = ref({
			id: row.id
			})
			request.post("/Material/deleteMaterialStore",flowData.value).then((res) => {
			request.post("/MaterialStore/deleteMaterialStore",flowData.value).then((res) => {
			if(res.code==200){
			ElMessage.success("删除成功")
			router.push({path:'/main/ingredients/SelectIngredients',query:{random:Math.random()}})
			@@ -66,7 +66,7 @@
			let total = reactive({
			pageTotal : 0,
			dataTotal : 0,
			pageSize : 2
			pageSize : 10
			})

			let filterData = ref({
			@@ -78,13 +78,13 @@
			let materialStore= ref([])

			let arr = [
			{type:'expand',fixed:'left',slots: { content:'content' },width: '50'},
			{type:'expand',fixed:'left',slots: { content:'content' },width: '60'},
			{title: '操作', width: '110', slots: { default: 'button_slot' },fixed:'left'},
			{ type: 'seq',fixed:'left', title: '自序', width: '80' },
			{field: 'id', width: '150',title: '物料编码', sortable: true,showOverflow:'ellipsis' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
			]

			/*//第一次加载默认
			//第一次加载默认
			value.value='原片'
			filterData.value.type='原片'
			request.get(`/BasicWarehouse/BasicWarehouseType/${value.value}`).then((res) => {
			@@ -93,11 +93,10 @@
			console.log(res.data)
			BasicData.value = res.data
			//添加列
			gridOptions.columns=arr
			gridOptions.columns=arr.slice()

			for (let i=0;i<BasicData.value.length;i++){
			let aa={field: BasicData.value[i].OperateType, width: '150',title: BasicData.value[i].OperateTypeName, sortable: true,showOverflow:'ellipsis' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
			console.log(gridOptions.columns)
			gridOptions.columns.push(aa)

			}
			@@ -106,7 +105,7 @@
			}else{
			ElMessage.warning(res.msg)
			}
			})*/
			})


			//列查询
			@@ -142,16 +141,15 @@
			//数据绑定
			const getWorks = () => {
			console.log(filterData.value)
			request.post(`/Material/getSelectMaterialStore/1/${total.pageSize}`,filterData.value).then((res) => {
			request.post(`/MaterialStore/getSelectMaterialStore/1/${total.pageSize}`,filterData.value).then((res) => {

			if(res.code==200){
			console.log(res.data.data)
			console.log(res.data)
			materialStore.value=[]
			for (let i=0;i<res.data.data.length;i++){
			materialStore.value[i]= JSON.parse(res.data.data[i].json)
			materialStore.value[i].id= res.data.data[i].id
			}
			console.log(materialStore)

			total.dataTotal = res.data.total.total*1
			total.pageTotal= res.data.total.pageTotal
			@@ -170,7 +168,7 @@
			//分页查询
			const getWorkPaging = () => {
			console.log(filterData.value)
			request.post(`/Material/getSelectMaterialStore/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
			request.post(`/MaterialStore/getSelectMaterialStore/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {

			if(res.code==200){
			console.log(res.data.data)
			@@ -179,6 +177,7 @@
			materialStore.value[i]= JSON.parse(res.data.data[i].json)
			materialStore.value[i].id= res.data.data[i].id
			}


			produceList = deepClone(materialStore.value)
			xGrid.value.loadData(produceList)
			@@ -196,16 +195,18 @@
			request.get(`/BasicWarehouse/BasicWarehouseType/${value.value}`).then((res) => {
			if(res.code==200){
			gridOptions.columns.splice(0,gridOptions.columns.length)
			console.log(res.data)
			BasicData.value = res.data
			//添加列
			gridOptions.columns=arr
			gridOptions.columns=arr.slice()

			for (let i=0;i<BasicData.value.length;i++){
			let aa={field: BasicData.value[i].OperateType, width: '150',title: BasicData.value[i].OperateTypeName, sortable: true,showOverflow:'ellipsis' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
			console.log(gridOptions.columns)
			gridOptions.columns.push(aa)

			}
			if (res.data.total!=null){
			total.dataTotal = res.data.total.total*1
			total.pageTotal= res.data.total.pageTotal
			}
			getWorkPaging()

			@@ -262,9 +263,9 @@
			],//表头按钮
			toolbarConfig: {

			import: false,
			/*import: false,
			export: true,
			print: true,
			print: true,*/
			zoom: true,
			custom: true
			},