Commit 7a46c96f authored by qinj's avatar qinj

Merge branch 'dev' of http://120.25.63.219:6088/rex/portalhtml into dev

parents c0d48e12 b9541455
......@@ -5,10 +5,13 @@
</Title>
<div class="basic-info" v-loading="loading">
<ele-form-section
ref="eleForm"
v-model="formData"
:request-fn="handleSubmit"
:rules="rules"
:sections="sections"
:isShowSubmitBtn="subBtn"
:isShowBackBtn="subBtn"
@request-success="handleSuccess"
/>
</div>
......@@ -44,6 +47,7 @@ export default {
loading: false,
addBtnStart: false,
displayBtn: false,
subBtn: true,
objectId: '',
formData: {},
sections: [
......@@ -329,6 +333,7 @@ export default {
},
methods: {
handleSubmit (data) {
console.log(this.$refs.eleForm)
const formData = this.$translateToC4CData(data)
formData.extCustomerType_SDK = '121'
console.log(formData)
......@@ -344,6 +349,7 @@ export default {
})
this.$message.success('创建成功')
this.loading = false
this.subBtn = false
})
},
handleSuccess () {
......
......@@ -281,29 +281,6 @@ export default {
}
}
},
// {
// title: "合作日期",
// formDesc: {
// ExtStartDate_SDK: {
// type: 'input',
// label: '初始合作开始时间',
// layout: 12,
// disabled: true
// },
// ExtAuthenticationDate_SDK: {
// type: 'input',
// label: '高级认证日期',
// layout: 12,
// disabled: true
// },
// ExtEndDate_SDK: {
// type: 'input',
// label: '合作终止日期',
// layout: 12,
// disabled: true
// },
// }
// }
],
rules: {}
}
......@@ -358,22 +335,31 @@ export default {
title: "合作日期",
formDesc: {
ExtStartDate_SDK: {
type: 'input',
label: '初始合作开始时间',
type: 'date',
label: '合作开始日期',
layout: 12,
disabled: true
disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
},
ExtAuthenticationDate_SDK: {
type: 'input',
type: 'date',
label: '高级认证日期',
layout: 12,
disabled: true
disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
},
ExtEndDate_SDK: {
type: 'input',
type: 'date',
label: '合作终止日期',
layout: 12,
disabled: true
disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
},
}
}
......
......@@ -233,53 +233,6 @@ export default {
},
}
},
// {
// title: "签约信息",
// formDesc: {
// ExtChannelType_SDKText: {
// type: 'input',
// label: '签约渠道类型',
// layout: 12,
// disabled: true,
// // value: 'ExtChannelType_SDKText'
// },
// ExtProductGroup_SDK: {
// type: 'input',
// label: '签约产品组',
// layout: 12,
// disabled: true
// },
// ExtTotalAgent_SDK: {
// type: 'input',
// label: '签约总代',
// layout: 12,
// disabled: true
// },
// }
// },
// {
// title: "合作日期",
// formDesc: {
// ExtStartDate_SDK: {
// type: 'input',
// label: '初始合作开始时间',
// layout: 12,
// disabled: true
// },
// ExtAuthenticationDate_SDK: {
// type: 'input',
// label: '高级认证日期',
// layout: 12,
// disabled: true
// },
// ExtEndDate_SDK: {
// type: 'input',
// label: '合作终止日期',
// layout: 12,
// disabled: true
// },
// }
// }
],
rules: {}
}
......
......@@ -316,16 +316,22 @@ export default {
title: "合作日期",
formDesc: {
ExtStartDate_SDK: {
type: 'input',
label: '初始合作开始时间',
type: 'date',
label: '合作开始日期',
layout: 12,
disabled: true
disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
},
ExtEndDate_SDK: {
type: 'input',
type: 'date',
label: '合作终止日期',
layout: 12,
disabled: true
disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
},
}
}
......
......@@ -50,6 +50,7 @@ export default {
isShowSubmitBtn: false,
isShowBackBtn: false,
isShowEditBtn: true,
addBtnStart: true,
sections: [
{
title: '基本信息',
......@@ -236,49 +237,26 @@ export default {
},
}
},
// {
// title: "签约信息",
// formDesc: {
// ExtChannelType_SDKText: {
// type: 'input',
// label: '签约渠道类型',
// layout: 12,
// disabled: true,
// },
// ExtProductGroup_SDK: {
// type: 'input',
// label: '签约产品组',
// layout: 12,
// disabled: true
// },
// ExtTotalAgent_SDK: {
// type: 'input',
// label: '签约总代',
// layout: 12,
// disabled: true
// },
// }
// },
{
title: "合作日期",
formDesc: {
ExtStartDate_SDK: {
type: 'input',
label: '初始合作开始时间',
type: 'date',
label: '合作开始日期',
layout: 12,
disabled: true
disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
},
// ExtAuthenticationDate_SDK: {
// type: 'input',
// label: '高级认证日期',
// layout: 12,
// disabled: true
// },
ExtEndDate_SDK: {
type: 'input',
type: 'date',
label: '合作终止日期',
layout: 12,
disabled: true
disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
},
}
}
......@@ -322,22 +300,31 @@ export default {
title: "合作日期",
formDesc: {
ExtStartDate_SDK: {
type: 'input',
label: '初始合作开始时间',
type: 'date',
label: '合作开始日期',
layout: 12,
disabled: true
disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
},
ExtAuthenticationDate_SDK: {
type: 'input',
type: 'date',
label: '高级认证日期',
layout: 12,
disabled: true
disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
},
ExtEndDate_SDK: {
type: 'input',
type: 'date',
label: '合作终止日期',
layout: 12,
disabled: true
disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
},
}
}
......
......@@ -13,17 +13,17 @@ const tableConfig = {
label: '公司名称',
showInSearch: true,
type: 'input',
fixed: 'left',
renderItem: (h, scope, listeners) => {
return h('el-button', {
on: {
click: (e) => listeners.handleDetails(scope.row)
},
props: {
type: 'text'
}
}, scope.row.ID)
}
// fixed: 'left',
// renderItem: (h, scope, listeners) => {
// return h('el-button', {
// on: {
// click: (e) => listeners.handleDetails(scope.row)
// },
// props: {
// type: 'text'
// }
// }, scope.row.ID)
// }
},
// ExtProductGroup_SDK: {
// label: '签约产品组',
......
......@@ -12,7 +12,8 @@
ref="eleTable"
v-bind="tableConfig"
:listeners="tableListeners"
:expand-params="expandParams"
:initialParams="initialParams"
/>
</div>
</div>
......@@ -26,8 +27,10 @@ export default {
inject: ['reload'],
data() {
return {
expandParams: {}, // 筛选条件
tableListeners: {}, // 事件监听对象,供ele-table内部调用
tableConfig: constant
tableConfig: constant,
initialParams: {}
}
},
created() {
......
......@@ -312,7 +312,6 @@ export default {
}
})
.catch(() => {
this.$message.error('登录异常,请重新登录')
this.loading = false
})
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment