ERP_override.git

			@@ -322,7 +322,7 @@
			</el-col>
			</el-row>
			<el-row v-show="props.rowIndex">
			<el-col :span="4">{{ $t('排序') }}:</el-col>
			<el-col :span="4">{{ $t('processCard.sorting') }}:</el-col>
			<el-col :span="12">
			<el-input type="number" v-model="basic.sort"/>
			</el-col>

			@@ -155,7 +155,7 @@
			{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'),filters: [{data: ''}],slots: { default: 'showNickname' ,filter: 'num1_filter'},filterMethod: filterChanged},
			{field:'sort',title: t('排序'),sortable: true,filters: [{data: ''}],slots: {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')},

	north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史