From cd2068187d4c64facb08769d4bb2b29a0d78803e Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 10 Aug 2020 09:10:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=81=E6=9C=80=E4=BD=8E=E7=89=88=E6=9C=AC=E5=BA=93?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=AD=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/src/js/columns/columns.js | 7 +- .../src/js/columns/customer/miniProManage.js | 75 ++ .../src/js/columns/customer/version.js | 20 + epmet-oper-web/src/js/service.js | 76 ++- .../src/views/components/CTable.vue | 4 +- .../src/views/modules/code/CommitList.vue | 229 ++++++- .../src/views/modules/code/OperHistory.vue | 126 +++- .../views/modules/code/SubmitFailReason.vue | 6 +- .../views/modules/code/SubmitForm copy.vue | 643 ++++++++++++++++++ .../src/views/modules/code/SubmitForm.vue | 404 +++++------ .../src/views/modules/code/SubmitItem.vue | 121 ++-- .../src/views/modules/code/VersionItem.vue | 551 +++++++++++++++ .../src/views/modules/code/VersionManage.vue | 236 +++++++ .../MiniProManage/BasicInfo.vue | 448 ++++++++++++ .../MiniProManage/Category.vue | 346 ++++++++++ .../MiniProManage/MiniProManage.vue | 266 ++++++++ .../customer-manage/MiniProManage/Version.vue | 186 +++++ 17 files changed, 3410 insertions(+), 334 deletions(-) create mode 100644 epmet-oper-web/src/js/columns/customer/miniProManage.js create mode 100644 epmet-oper-web/src/js/columns/customer/version.js create mode 100644 epmet-oper-web/src/views/modules/code/SubmitForm copy.vue create mode 100644 epmet-oper-web/src/views/modules/code/VersionItem.vue create mode 100644 epmet-oper-web/src/views/modules/code/VersionManage.vue create mode 100644 epmet-oper-web/src/views/modules/customer-manage/MiniProManage/BasicInfo.vue create mode 100644 epmet-oper-web/src/views/modules/customer-manage/MiniProManage/Category.vue create mode 100644 epmet-oper-web/src/views/modules/customer-manage/MiniProManage/MiniProManage.vue create mode 100644 epmet-oper-web/src/views/modules/customer-manage/MiniProManage/Version.vue diff --git a/epmet-oper-web/src/js/columns/columns.js b/epmet-oper-web/src/js/columns/columns.js index ed222c4..545442b 100644 --- a/epmet-oper-web/src/js/columns/columns.js +++ b/epmet-oper-web/src/js/columns/columns.js @@ -3,6 +3,8 @@ import CommitCode from './code/commitCode' import OperHistory from './code/operHistory' import Category from './code/category' import RegisterInfo from './customer/customer' +import MiniProManage from './customer/miniProManage' +import Version from './customer/version' export default { Temp: Temp, // 代码上传——模板list @@ -11,6 +13,7 @@ export default { OperHistory: OperHistory, // 代码上传——操作历史 Category: Category, // 代码上传——审核项——类目 - RegisterInfo: RegisterInfo // 客户管理——客户注册信息 - + RegisterInfo: RegisterInfo, // 客户管理——客户注册信息 + MiniProManage: MiniProManage, // 客户管理——客户小程序管理 + Version: Version // 客户管理——基础库 } diff --git a/epmet-oper-web/src/js/columns/customer/miniProManage.js b/epmet-oper-web/src/js/columns/customer/miniProManage.js new file mode 100644 index 0000000..10d8e00 --- /dev/null +++ b/epmet-oper-web/src/js/columns/customer/miniProManage.js @@ -0,0 +1,75 @@ +export default [ + { + key: 'customerName', + title: '客户名称', + type: 'select', + rule: [ + { + required: true, + message: '请选择客户', + trigger: 'blur' + } + ], + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: false, + width: 120 + }, + { + key: 'clientType', + title: '类型', + type: 'radio', + rule: [ + { + required: true, + message: '请选择类型', + trigger: 'blur' + } + ], + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: false, + width: 80, + format: (cellValue, index) => { + if (cellValue === 'resi') { + return '居民端' + } else if (cellValue === 'work') { + return '工作端' + } else { + return '未知' + } + } + }, + { + key: 'appId', + title: 'appId', + type: 'radio', + rule: [ + { + required: true, + message: '请输入appId', + trigger: 'blur' + } + ], + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 120 + }, + { + key: 'version', + title: '版本号', + type: 'input', + rule: [ + { + required: true, + message: '请输入版本号', + trigger: 'blur' + } + ], + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 80 + } +] diff --git a/epmet-oper-web/src/js/columns/customer/version.js b/epmet-oper-web/src/js/columns/customer/version.js new file mode 100644 index 0000000..fcd4032 --- /dev/null +++ b/epmet-oper-web/src/js/columns/customer/version.js @@ -0,0 +1,20 @@ +export default [ + { + key: 'percentage', + title: '百分比', + type: 'select', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: false, + width: 120 + }, + { + key: 'version', + title: '版本', + type: 'radio', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: false, + width: 80 + } +] diff --git a/epmet-oper-web/src/js/service.js b/epmet-oper-web/src/js/service.js index fcb4908..7b689db 100644 --- a/epmet-oper-web/src/js/service.js +++ b/epmet-oper-web/src/js/service.js @@ -2,21 +2,21 @@ import column from '@js/columns/columns' export default { - /** - * 获取列 - * - * @param keyword - * @param type - * @returns {Array} - */ - getColumns (keyword, type) { + /** + * 获取列 + * + * @param keyword + * @param type + * @returns {Array} + */ + getColumns(keyword, type) { if (!keyword) { return [] } let columns = column[keyword] let colFrozen = [] // 左固定列 let colNormal = [] // 非固定列 - columns.forEach(column => { + columns.forEach((column) => { let _col = this.formatCol(column, type) if (_col) { if (_col.isFrozen) { @@ -32,14 +32,14 @@ export default { return [colFrozen, colNormal] }, - /** - * 格式化列 - * - * @param col - * @param type - * @returns {*} - */ - formatCol (column, type) { + /** + * 格式化列 + * + * @param col + * @param type + * @returns {*} + */ + formatCol(column, type) { // 防止污染column.js基础配置 let col = {} Object.assign(col, column) @@ -58,7 +58,7 @@ export default { if (!column.width) { col.width = 120 } - col.formatter = rowData => { + col.formatter = (rowData) => { // 没有数值 if (!rowData[column.key] && rowData[column.key] != '0') return '--' if (column.format) { @@ -77,10 +77,12 @@ export default { } } if (column.renderType) { - col.render = function (data, row) { + col.render = function(data, row) { switch (column.renderType) { case 'image': - return '' + return ( + '' + ) break case 'icon': return '' @@ -128,18 +130,18 @@ export default { } }, - /** - * 获取验证规则 - * - * @param keyword - */ - getRules (keyword) { + /** + * 获取验证规则 + * + * @param keyword + */ + getRules(keyword) { let rules = {} let _columns = column[keyword] if (_columns) { - _columns.forEach(_column => { + _columns.forEach((_column) => { if (_column.rule) { - _column.rule.forEach(_col => { + _column.rule.forEach((_col) => { if (!_col.message) { Object.assign(_col, { message: _col.title + '不合法' }) } @@ -151,16 +153,16 @@ export default { return rules }, - /** - * 获取model - * - * @param keyword - */ - getModel (keyword) { + /** + * 获取model + * + * @param keyword + */ + getModel(keyword) { let _model = {} let _columns = column[keyword] if (_columns) { - _columns.forEach(_column => { + _columns.forEach((_column) => { if (_column.display && _column.display.includes('model')) { _model[_column.key] = this.initValue(_column) } @@ -174,7 +176,7 @@ export default { * @param col * @returns {string|number|Array} */ - initValue (col) { + initValue(col) { let value switch (col.type) { case 'input': @@ -212,7 +214,7 @@ export default { return value } } -function getTagColor (title) { +function getTagColor(title) { let color switch (title) { case '启用': diff --git a/epmet-oper-web/src/views/components/CTable.vue b/epmet-oper-web/src/views/components/CTable.vue index db37e52..9f52ebe 100644 --- a/epmet-oper-web/src/views/components/CTable.vue +++ b/epmet-oper-web/src/views/components/CTable.vue @@ -70,7 +70,7 @@