Browse Source

以为表导入

pull/154/head
wangxy 3 years ago
parent
commit
17925cf128
2 changed files with 18 additions and 19 deletions
  1. +13
    -13
      src/views/system/oneimport/addOrEdit.vue
  2. +5
    -6
      src/views/system/oneimport/index.vue

+ 13
- 13
src/views/system/oneimport/addOrEdit.vue View File

@ -34,16 +34,16 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item :label="getColumnName('Script-ScriptType')"> <el-form-item :label="getColumnName('Script-ScriptType')">
<el-input v-model="formData['Script-ScriptType']" placeholder="请输入" /> <el-input v-model="formData['Script-ScriptType']" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="8">
</el-col> -->
<!-- <el-col :span="8">
<el-form-item :label="getColumnName('Script-FilePath')"> <el-form-item :label="getColumnName('Script-FilePath')">
<el-input v-model="formData['Script-FilePath']" placeholder="请输入" /> <el-input v-model="formData['Script-FilePath']" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col>
</el-col> -->
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="getColumnName('Script-UseHead')"> <el-form-item :label="getColumnName('Script-UseHead')">
<el-input-number v-model="formData['Script-UseHead']" placeholder="请输入" /> <el-input-number v-model="formData['Script-UseHead']" placeholder="请输入" />
@ -79,16 +79,16 @@
<el-input-number v-model="formData['Script-AppendAndUpdateRecord']" placeholder="请输入" /> <el-input-number v-model="formData['Script-AppendAndUpdateRecord']" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item :label="getColumnName('Script-CallSpecFunc')"> <el-form-item :label="getColumnName('Script-CallSpecFunc')">
<el-input-number v-model="formData['Script-CallSpecFunc']" placeholder="请输入" /> <el-input-number v-model="formData['Script-CallSpecFunc']" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="8">
</el-col> -->
<!-- <el-col :span="8">
<el-form-item :label="getColumnName('Script-CallFunction')"> <el-form-item :label="getColumnName('Script-CallFunction')">
<el-input v-model="formData['Script-CallFunction']" placeholder="请输入" /> <el-input v-model="formData['Script-CallFunction']" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col>
</el-col> -->
<el-col :span="24"> <el-col :span="24">
<el-table <el-table
style="width: 100%;margin-bottom:10px;" style="width: 100%;margin-bottom:10px;"
@ -111,7 +111,7 @@
<el-input v-model="scope.row['ScriptItem-ColName']" clearable placeholder="请输入" /> <el-input v-model="scope.row['ScriptItem-ColName']" clearable placeholder="请输入" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="getColumnName('ScriptItem-RowNo')">
<!-- <el-table-column :label="getColumnName('ScriptItem-RowNo')">
<template #default="scope"> <template #default="scope">
<el-input-number v-model="scope.row['ScriptItem-RowNo']" clearable placeholder="请输入" /> <el-input-number v-model="scope.row['ScriptItem-RowNo']" clearable placeholder="请输入" />
</template> </template>
@ -120,10 +120,10 @@
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row['ScriptItem-RowName']" clearable placeholder="请输入" /> <el-input v-model="scope.row['ScriptItem-RowName']" clearable placeholder="请输入" />
</template> </template>
</el-table-column>
</el-table-column> -->
<el-table-column :label="getColumnName('ScriptItem-ColFieldType')"> <el-table-column :label="getColumnName('ScriptItem-ColFieldType')">
<template #default="scope"> <template #default="scope">
<el-input-number v-model="scope.row['ScriptItem-ColFieldType']" clearable placeholder="请输入" />
<el-input v-model="scope.row['ScriptItem-ColFieldType']" clearable placeholder="请输入" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="getColumnName('ScriptItem-ColFormat')"> <el-table-column :label="getColumnName('ScriptItem-ColFormat')">
@ -245,8 +245,8 @@ export default {
'ScriptItem-TabMapCol': undefined, 'ScriptItem-TabMapCol': undefined,
'ScriptItem-ColNo': undefined, 'ScriptItem-ColNo': undefined,
'ScriptItem-ColName': undefined, 'ScriptItem-ColName': undefined,
'ScriptItem-RowNo': undefined,
'ScriptItem-RowName': undefined,
// 'ScriptItem-RowNo': undefined,
// 'ScriptItem-RowName': undefined,
'ScriptItem-ColFieldType': undefined, 'ScriptItem-ColFieldType': undefined,
'ScriptItem-ColFormat': undefined, 'ScriptItem-ColFormat': undefined,
'ScriptItem-DefaultValue': undefined 'ScriptItem-DefaultValue': undefined


+ 5
- 6
src/views/system/oneimport/index.vue View File

@ -51,7 +51,6 @@
:key="index" :key="index"
:label="getColumnName(item)" :label="getColumnName(item)"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="150"
> >
<template #default="scope"> <template #default="scope">
<span v-if="item === 'Script-PlantNr'">{{ <span v-if="item === 'Script-PlantNr'">{{
@ -60,7 +59,7 @@
<span v-else>{{ scope.row[item] }}</span> <span v-else>{{ scope.row[item] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="260" fixed="right">
<el-table-column label="操作" width="250">
<template #default="scope"> <template #default="scope">
<el-button <el-button
class="edit-button-style" class="edit-button-style"
@ -125,8 +124,8 @@ export default {
"Script-Script", "Script-Script",
"Script-Bez", "Script-Bez",
"Script-ScriptTable", "Script-ScriptTable",
"Script-ScriptType",
"Script-FilePath",
// "Script-ScriptType",
// "Script-FilePath",
"Script-Separator", "Script-Separator",
"Script-UseHead", "Script-UseHead",
"Script-ClearTable", "Script-ClearTable",
@ -135,8 +134,8 @@ export default {
"Script-AppendNewRecord", "Script-AppendNewRecord",
"Script-UpdateRecord", "Script-UpdateRecord",
"Script-AppendAndUpdateRecord", "Script-AppendAndUpdateRecord",
"Script-CallSpecFunc",
"Script-CallFunction",
// "Script-CallSpecFunc",
// "Script-CallFunction",
], // ], //
tableHeight: 0, tableHeight: 0,
isShowDialog: '', isShowDialog: '',


Loading…
Cancel
Save