ERP_override.git

			@@ -126,11 +126,11 @@
			},//表头参数
			columns:[
			{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
			{title: '操作', width: 140, slots: { default: 'button_slot' },fixed:"left"},
			{field: 'id', width: 60, title: 'id',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged,},
			{field: 'basic_type',width: 370, title: '类型', showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
			{field: 'basic_name', width: 330,title: '名称', filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
			{field: 'd_basic_name',width: 330, title: '类别'},
			{title: t('basicData.operate'), width: 140, slots: { default: 'button_slot' },fixed:"left"},
			{field: 'id', width: 60, title: t('productionBasicData.id'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged,},
			{field: 'basic_type',width: 370, title: t('machine.type'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
			{field: 'basic_name', width: 330,title: t('orderBasicData.name'), filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
			{field: 'd_basic_name',width: 330, title: t('productionBasicData.basicName')},
			],
			//表头按钮
			toolbarConfig: {
			@@ -209,7 +209,7 @@
			<template #button_slot="{ row }">
			<!-- <el-button @click="getTableRow(row,'edit');" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>-->
			<el-button @click="getTableRow(row,'edit')"
			v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"
			v-if="userStore.user.permissions.indexOf('selectProductionBasicData.edit') > -1"
			link
			type="primary"
			size="small">
			@@ -225,7 +225,9 @@
			<template #num1_filter="{ column, $panel }">
			<div>
			<div v-for="(option, index) in column.filters" :key="index">
			<input type="text" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
			<input type="text" v-model="option.data"
			@keyup.enter.native="$panel.confirmFilter()"
			@input="changeFilterEvent($event, option, $panel)"/>
			</div>
			</div>
			</template>
			@@ -233,10 +235,10 @@

			</vxe-grid>

			<el-dialog v-model="dialogTableVisible" title="基础数据修改">
			<el-dialog v-model="dialogTableVisible" :title="$t('productionBasicData.basicDataEdit')">
			<el-row>
			<el-col :span="2">
			<el-text>id：</el-text>
			<el-text>{{$t('productionBasicData.id')}}：</el-text>
			</el-col>
			<el-col :span="3">
			<el-input v-model="getBasicData.id" readonly autocomplete="off" style="width: 220px"/>
			@@ -244,7 +246,7 @@
			</el-row>
			<el-row>
			<el-col :span="2">
			<el-text>类型：</el-text>
			<el-text>{{$t('machine.type')}}：</el-text>
			</el-col>
			<el-col :span="3">
			<el-input v-model="getBasicData.basic_type" readonly autocomplete="off" style="width: 220px"/>
			@@ -252,7 +254,7 @@
			</el-row>
			<el-row>
			<el-col :span="2">
			<el-text>名称：</el-text>
			<el-text>{{$t('orderBasicData.name')}}：</el-text>
			</el-col>
			<el-col :span="3">
			<el-input v-model="getBasicData.basic_name" autocomplete="off" style="width: 220px"/>
			@@ -260,7 +262,7 @@
			</el-row>
			<el-row>
			<el-col :span="2">
			<el-text>类别：</el-text>
			<el-text>{{$t('productionBasicData.basicName')}}：</el-text>
			</el-col>
			<el-col :span="3">
			<!-- <el-input v-model="getBasicData.d_basic_name" autocomplete="off" style="width: 220px"/>-->
			@@ -278,9 +280,9 @@

			<template #footer>
			<span class="dialog-footer">
			<el-button @click="dialogTableVisible = false">取消</el-button>
			<el-button @click="dialogTableVisible = false">{{$t('basicData.cancelButtonText')}}</el-button>
			<el-button type="primary" @click="updateBasic">
			修改
			{{$t('basicData.update')}}
			</el-button>
			</span>
			</template>