Skip to content

P
portalhtml
Commit 7a46c96f authored by qinj's avatar qinj
Browse files
Options

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

parents c0d48e12 b9541455
Show whitespace changes
Inline Side-by-side
Showing with 77 additions and 137 deletions
src/views/customers/customers-add/index.vue
View file @ 7a46c96f
...@@ -5,10 +5,13 @@ ...@@ -5,10 +5,13 @@
</Title> </Title>
<div class="basic-info" v-loading="loading"> <div class="basic-info" v-loading="loading">
<ele-form-section <ele-form-section
ref="eleForm"
v-model="formData" v-model="formData"
:request-fn="handleSubmit" :request-fn="handleSubmit"
:rules="rules" :rules="rules"
:sections="sections" :sections="sections"
:isShowSubmitBtn="subBtn"
:isShowBackBtn="subBtn"
@request-success="handleSuccess" @request-success="handleSuccess"
/> />
</div> </div>
...@@ -44,6 +47,7 @@ export default { ...@@ -44,6 +47,7 @@ export default {
loading: false, loading: false,
addBtnStart: false, addBtnStart: false,
displayBtn: false, displayBtn: false,
subBtn: true,
objectId: '', objectId: '',
formData: {}, formData: {},
sections: [ sections: [
...@@ -329,6 +333,7 @@ export default { ...@@ -329,6 +333,7 @@ export default {
}, },
methods: { methods: {
handleSubmit (data) { handleSubmit (data) {
console.log(this.$refs.eleForm)
const formData = this.$translateToC4CData(data) const formData = this.$translateToC4CData(data)
formData.extCustomerType_SDK = '121' formData.extCustomerType_SDK = '121'
console.log(formData) console.log(formData)
...@@ -344,6 +349,7 @@ export default { ...@@ -344,6 +349,7 @@ export default {
}) })
this.$message.success('创建成功') this.$message.success('创建成功')
this.loading = false this.loading = false
this.subBtn = false
}) })
}, },
handleSuccess () { handleSuccess () {
......
src/views/customers/customers-details/area.vue
View file @ 7a46c96f
...@@ -281,29 +281,6 @@ export default { ...@@ -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: {} rules: {}
} }
...@@ -358,22 +335,31 @@ export default { ...@@ -358,22 +335,31 @@ export default {
title: "合作日期", title: "合作日期",
formDesc: { formDesc: {
ExtStartDate_SDK: { ExtStartDate_SDK: {
type: 'input', type: 'date',
label: '初始合作开始时间', label: '合作开始日期',
layout: 12, layout: 12,
disabled: true disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
}, },
ExtAuthenticationDate_SDK: { ExtAuthenticationDate_SDK: {
type: 'input', type: 'date',
label: '高级认证日期', label: '高级认证日期',
layout: 12, layout: 12,
disabled: true disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
}, },
ExtEndDate_SDK: { ExtEndDate_SDK: {
type: 'input', type: 'date',
label: '合作终止日期', label: '合作终止日期',
layout: 12, layout: 12,
disabled: true disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
}, },
} }
} }
......
src/views/customers/customers-details/index.vue
View file @ 7a46c96f
...@@ -233,53 +233,6 @@ export default { ...@@ -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: {} rules: {}
} }
......
src/views/customers/customers-details/province.vue
View file @ 7a46c96f
...@@ -316,16 +316,22 @@ export default { ...@@ -316,16 +316,22 @@ export default {
title: "合作日期", title: "合作日期",
formDesc: { formDesc: {
ExtStartDate_SDK: { ExtStartDate_SDK: {
type: 'input', type: 'date',
label: '初始合作开始时间', label: '合作开始日期',
layout: 12, layout: 12,
disabled: true disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
}, },
ExtEndDate_SDK: { ExtEndDate_SDK: {
type: 'input', type: 'date',
label: '合作终止日期', label: '合作终止日期',
layout: 12, layout: 12,
disabled: true disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
}, },
} }
} }
......
src/views/customers/personal-customers/index.vue
View file @ 7a46c96f
...@@ -50,6 +50,7 @@ export default { ...@@ -50,6 +50,7 @@ export default {
isShowSubmitBtn: false, isShowSubmitBtn: false,
isShowBackBtn: false, isShowBackBtn: false,
isShowEditBtn: true, isShowEditBtn: true,
addBtnStart: true,
sections: [ sections: [
{ {
title: '基本信息', title: '基本信息',
...@@ -236,49 +237,26 @@ export default { ...@@ -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: "合作日期", title: "合作日期",
formDesc: { formDesc: {
ExtStartDate_SDK: { ExtStartDate_SDK: {
type: 'input', type: 'date',
label: '初始合作开始时间', label: '合作开始日期',
layout: 12, layout: 12,
disabled: true disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
}, },
// ExtAuthenticationDate_SDK: {
// type: 'input',
// label: '高级认证日期',
// layout: 12,
// disabled: true
// },
ExtEndDate_SDK: { ExtEndDate_SDK: {
type: 'input', type: 'date',
label: '合作终止日期', label: '合作终止日期',
layout: 12, layout: 12,
disabled: true disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
}, },
} }
} }
...@@ -322,22 +300,31 @@ export default { ...@@ -322,22 +300,31 @@ export default {
title: "合作日期", title: "合作日期",
formDesc: { formDesc: {
ExtStartDate_SDK: { ExtStartDate_SDK: {
type: 'input', type: 'date',
label: '初始合作开始时间', label: '合作开始日期',
layout: 12, layout: 12,
disabled: true disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
}, },
ExtAuthenticationDate_SDK: { ExtAuthenticationDate_SDK: {
type: 'input', type: 'date',
label: '高级认证日期', label: '高级认证日期',
layout: 12, layout: 12,
disabled: true disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
}, },
ExtEndDate_SDK: { ExtEndDate_SDK: {
type: 'input', type: 'date',
label: '合作终止日期', label: '合作终止日期',
layout: 12, layout: 12,
disabled: true disabled: true,
attrs: {
valueFormat: "yyyy-MM-dd"
}
}, },
} }
} }
......
src/views/customers/potential-customers/constant.js
View file @ 7a46c96f
...@@ -13,17 +13,17 @@ const tableConfig = { ...@@ -13,17 +13,17 @@ const tableConfig = {
label: '公司名称', label: '公司名称',
showInSearch: true, showInSearch: true,
type: 'input', type: 'input',
fixed: 'left', // fixed: 'left',
renderItem: (h, scope, listeners) => { // renderItem: (h, scope, listeners) => {
return h('el-button', { // return h('el-button', {
on: { // on: {
click: (e) => listeners.handleDetails(scope.row) // click: (e) => listeners.handleDetails(scope.row)
}, // },
props: { // props: {
type: 'text' // type: 'text'
} // }
}, scope.row.ID) // }, scope.row.ID)
} // }
}, },
// ExtProductGroup_SDK: { // ExtProductGroup_SDK: {
// label: '签约产品组', // label: '签约产品组',
......
src/views/customers/potential-customers/index.vue
View file @ 7a46c96f
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
ref="eleTable" ref="eleTable"
v-bind="tableConfig" v-bind="tableConfig"
:listeners="tableListeners" :listeners="tableListeners"
:expand-params="expandParams"
:initialParams="initialParams"
/> />
</div> </div>
</div> </div>
...@@ -26,8 +27,10 @@ export default { ...@@ -26,8 +27,10 @@ export default {
inject: ['reload'], inject: ['reload'],
data() { data() {
return { return {
expandParams: {}, // 筛选条件
tableListeners: {}, // 事件监听对象，供ele-table内部调用 tableListeners: {}, // 事件监听对象，供ele-table内部调用
tableConfig: constant tableConfig: constant,
initialParams: {}
} }
}, },
created() { created() {
......
src/views/login/index.vue
View file @ 7a46c96f
...@@ -312,7 +312,6 @@ export default { ...@@ -312,7 +312,6 @@ export default {
} }
}) })
.catch(() => { .catch(() => {
this.$message.error('登录异常，请重新登录')
this.loading = false this.loading = false
}) })
} else { } 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