Browse Source

Merge pull request '一维表导入' (#156) from wangxy into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/156
pull/157/head
wangxy 3 years ago
parent
commit
f50a337969
2 changed files with 13 additions and 30 deletions
  1. +12
    -29
      src/views/system/oneimport/addOrEdit.vue
  2. +1
    -1
      src/views/system/oneimport/upload.vue

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

@ -49,24 +49,12 @@
<el-input-number v-model="formData['Script-StartCol']" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-checkbox v-model="formData['Script-ClearTable']">{{getColumnName('Script-ClearTable')}}</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-checkbox v-model="formData['Script-AppendNewRecord']">{{getColumnName('Script-AppendNewRecord')}}</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-checkbox v-model="formData['Script-UpdateRecord']">{{getColumnName('Script-UpdateRecord')}}</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="24">
<el-form-item>
<el-checkbox v-model="formData['Script-AppendAndUpdateRecord']">{{getColumnName('Script-AppendAndUpdateRecord')}}</el-checkbox>
<el-checkbox v-model="formData['Script-ClearTable']" :label="getColumnName('Script-ClearTable')" @change="changeCheckbox('ClearTable')" />
<el-checkbox v-model="formData['Script-AppendNewRecord']" :label="getColumnName('Script-AppendNewRecord')" @change="changeCheckbox('AppendNewRecord')" />
<el-checkbox v-model="formData['Script-UpdateRecord']" :label="getColumnName('Script-UpdateRecord')" @change="changeCheckbox('UpdateRecord')" />
<el-checkbox v-model="formData['Script-AppendAndUpdateRecord']" :label="getColumnName('Script-AppendAndUpdateRecord')" @change="changeCheckbox('AppendAndUpdateRecord')" />
</el-form-item>
</el-col>
<el-col :span="24">
@ -157,9 +145,6 @@ export default {
this.formData = res.data
})
}
},
created() {
},
data() {
return {
@ -184,6 +169,13 @@ export default {
};
},
methods: {
// checkbox
changeCheckbox(arg) {
this.formData['Script-ClearTable'] = arg === 'ClearTable'
this.formData['Script-AppendNewRecord'] = arg === 'AppendNewRecord'
this.formData['Script-UpdateRecord'] = arg === 'UpdateRecord'
this.formData['Script-AppendAndUpdateRecord'] = arg === 'AppendAndUpdateRecord'
},
//
getColumnEvent() {
let params = {
@ -191,13 +183,6 @@ export default {
}
get('/admin/base/scriptitem/selecttableinfo', params).then((res) => {
if (res.code === 200) {
// let newDataArray = []
// res.data.forEach(el => {
// newDataArray.push({
// 'DataTableLst-TargetField': el.fieldName,
// 'DataTableLst-FieldType': el.fieldType
// })
// })
this.formData['Script-ScriptItem'] = res.data || []
}
})
@ -208,8 +193,6 @@ export default {
'ScriptItem-TabMapCol': undefined,
'ScriptItem-ColNo': undefined,
'ScriptItem-ColName': undefined,
// 'ScriptItem-RowNo': undefined,
// 'ScriptItem-RowName': undefined,
'ScriptItem-ColFieldType': undefined,
'ScriptItem-ColFormat': undefined,
'ScriptItem-DefaultValue': undefined


+ 1
- 1
src/views/system/oneimport/upload.vue View File

@ -61,7 +61,7 @@ export default {
message: '导入成功',
type: 'success'
})
this.$emit('editCallBack', true)
this.$emit('update:isShowDialog','')
} else {
this.$message({
showClose: true,


Loading…
Cancel
Save