ERP_override.git

			@@ -42,6 +42,10 @@
			{
			"label": t('orderBasicData.saleMan'),
			"value": "saleMan"
			},
			{
			"label": t('order.edgingType'),
			"value": "edgingType"
			}
			]
			},
			@@ -154,7 +158,8 @@
			{title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
			{type: 'seq', title: t('basicData.number'), width: 80 ,fixed:"left",},
			{field:'basicName',title: t('orderBasicData.name'),filters: [{data: ''}],slots: {filter: 'num1_filter'},filterMethod: filterChanged},
			{field:'nickname',title: t('orderBasicData.alias')},
			{field:'nickname',title: t('orderBasicData.alias'),filters: [{data: ''}],slots: { default: 'showNickname' ,filter: 'num1_filter'},filterMethod: filterChanged},
			{field:'sort',title: t('processCard.sorting'),sortable: true,filters: [{data: ''}],slots: {filter: 'num1_filter'},filterMethod: filterChanged},
			{field:'createTime',title: t('basicData.creationTime')},


			@@ -203,11 +208,8 @@

			const getChildrenFunction = (flag) => {
			if(flag){
			router.push({
			path:'/main/orderBasicData/searchBasicData',
			query:{random:Math.random()
			}
			})
			dialogTableVisible.value=false
			handleChange()
			}
			}

			@@ -278,6 +280,11 @@
			</el-popconfirm>
			</template>

			<template #showNickname="{ row,column, $panel }">
			<span v-if="row.basicCategory==='icon' && row.nickname!=null">picture</span>
			<span v-else>{{row.nickname}}</span>
			</template>

			<template #num1_filter="{ column, $panel }">
			<div>
			<div v-for="(option, index) in column.filters" :key="index">
			@@ -312,7 +319,9 @@
			<el-dialog
			v-model="dialogTableVisible"
			destroy-on-close
			style="width: 30%;height:40% ">
			:close-on-click-modal="false"
			:close-on-press-escape="false"
			style="width: 30%;height:50% ">
			<create-basic-data :rowIndex="rowIndex" @gaveParent='getChildrenFunction'/>
			</el-dialog>
			</div>