~admin/ERP_override.git

			@@ -13,10 +13,19 @@
			let productGlassTypeStore = useProductGlassTypeStore()
			let router=useRouter()
			//监听玻璃类型改变
			let productList = ref([])

			let glassType = ref([])
			watch(productGlassTypeStore,(newVal,oldVal) => {
			let list = productList.filter( product=>{
			return product.glassType==newVal.GlassType
			request.post("/product/1/100/"+productGlassTypeStore.GlassType,filterData.value).then((res) => {
			if(res.code==200){
			xGrid.value.loadData(res.data)
			gridOptions.loading=false
			}else{
			ElMessage.warning(res.msg)
			}
			})

			})

			let scrollTop =ref(null)
			@@ -28,7 +37,11 @@
			scrollHeight.value = row.$event.target.scrollHeight
			clientHeight.value = row.$event.target.clientHeight
			}

			let filterData = ref({
			basicGlassType:{
			typeName:''
			}
			})

			let produceList = ref([])
			let pageNum=$ref(1)
			@@ -67,7 +80,7 @@
			}
			if(pageState!==null){
			gridOptions.loading=true
			request.get(`/product/${pageNum}/100`).then((res) => {
			request.post(`/product/${pageNum}/100/${productGlassTypeStore.GlassType}`,filterData.value).then((res) => {
			try{
			if(res.code==200){
			if(pageState){
			@@ -93,23 +106,16 @@
			}


			//后端获取有多少页，超过多少页不再请求
			/*if(pageNum>5){
			console.log(newVal.pageNum)
			return
			}*/


			})
			request.get("/product/1/100").then((res) => {
			request.post("/product/1/100/"+productGlassTypeStore.GlassType,filterData.value).then((res) => {
			if(res.code==200){
			console.log(res.data)
			produceList = produceList.value.concat(deepClone(res.data))

			xGrid.value.reloadData(produceList)
			gridOptions.loading=false
			}else{
			ElMessage.warning(res.msg)
			router.push("/login")
			}
			})

			@@ -167,17 +173,18 @@
			showStatus: true
			},
			columns:[
			{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
			{type:'expand',fixed:"left",slots: { content:'content' },width: 60},
			{type: 'seq',fixed:"left", title: '自序', width: 80 },
			{title: '操作', width: 110, slots: { default: 'button_slot' },fixed:"left"},
			{field: 'id', title: '编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'product', title: '名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'glassTypes.typeName', title: '所属类别',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'query', title: '快速查询',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'remarks', title: '备注',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'creator', title: '创建人',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
			{field: 'createTime', title: '创建时间',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
			{field: 'id', title: '编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
			{field: 'productName', title: '名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
			{field: 'basicGlassType.typeName', title: '所属类别',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
			{field: 'query', title: '快速查询',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
			{field: 'remarks', title: '备注',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
			{field: 'creator', title: '创建人',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
			{field: 'createTime', title: '创建时间',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false}
			],//表头参数
			data:null,//表格数据
			toolbarConfig: {
			buttons: [],
			import: false,
			@@ -190,7 +197,7 @@
			return[
			columns.map((column, columnIndex) => {
			if (columnIndex === 0) {
			return '合计:'
			return '页数:'
			}
			return ''
			})
			@@ -199,7 +206,7 @@

			})


			//表格拖拽
			let sortable2: any

			const columnDrop2 = () => {
			@@ -250,6 +257,39 @@
			}
			})

			const changeFilterEvent = (event, option, $panel,) => {
			// 手动触发筛选
			$panel.changeOption(event, !!option.data, option)
			}
			function filterChanged(column){
			gridOptions.loading=true
			//筛选条件发生变化条件发生变化
			let value = column.datas[0]!=undefined?column.datas[0]:''
			value = value.trim()
			//判断是否存在外键
			if (column.property.indexOf('.')>-1){
			const columnArr = column.property.split('.')
			filterData.value[columnArr[0]] = {
			[columnArr[1]]:value
			}
			}else{
			filterData.value[column.property] = value
			}
			request.post("/product/1/100/"+productGlassTypeStore.GlassType,filterData.value).then((res) => {
			if(res.code==200){
			produceList = deepClone(res.data)
			xGrid.value.loadData(produceList)
			gridOptions.loading=false
			}else{
			ElMessage.warning(res.msg)
			}
			})
			}
			const hasDecimal = (value) => {
			const regex = /\./; // 定义正则表达式，查找小数点
			return regex.test(value); // 返回true/false
			}


			</script>

			@@ -264,6 +304,7 @@


			<vxe-grid
			@filter-change="filterChanged"
			max-height="100%"
			class="mytable-scrollbar"
			ref="xGrid"
			@@ -278,7 +319,9 @@
			<ul class="expand-wrapper">
			<li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
			<span style="font-weight: bold">{{item.title+': '}}</span>
			<span>{{ row[item.field] }}</span>
			<span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
			<span v-else>{{ row[item.field] }}</span>

			</li>
			</ul>
			</template>