From 23ebfe5d08535e8a15513e363910e555612b4546 Mon Sep 17 00:00:00 2001 From: jiangyuying Date: Mon, 20 Jul 2020 09:11:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=B4=A0=E6=9D=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/js/columns/code/commitCode.js | 45 ++- epmet-oper-web/src/main.js | 2 + epmet-oper-web/src/router/index.js | 4 +- epmet-oper-web/src/views/components/CForm.vue | 4 +- .../src/views/components/CTable.vue | 16 +- .../src/views/modules/code/CommitForm.vue | 43 ++- .../src/views/modules/code/CommitList.vue | 74 +++-- .../src/views/modules/code/SubmitForm.vue | 300 +++++++++++++----- 8 files changed, 348 insertions(+), 140 deletions(-) diff --git a/epmet-oper-web/src/js/columns/code/commitCode.js b/epmet-oper-web/src/js/columns/code/commitCode.js index 4d07ac5..860970b 100644 --- a/epmet-oper-web/src/js/columns/code/commitCode.js +++ b/epmet-oper-web/src/js/columns/code/commitCode.js @@ -10,8 +10,8 @@ export default { trigger: 'blur' }], display: ['formA', 'formU', 'table', 'model'], - fixed: true, - block: true, + fixed: false, + block: false, width: 120 }, { @@ -24,9 +24,9 @@ export default { trigger: 'blur' }], display: ['formA', 'formU', 'table', 'model'], - fixed: true, - block: true, - width: 120, + fixed: false, + block: false, + width: 80, format: function (cellValue, index) { if (cellValue === 'resi') { return '居民端' @@ -47,7 +47,7 @@ export default { trigger: 'blur' }], display: ['formA', 'formU', 'table', 'model'], - fixed: true, + fixed: false, block: true, width: 120 }, @@ -61,9 +61,9 @@ export default { trigger: 'blur' }], display: ['formA', 'formU', 'table', 'model'], - fixed: true, + fixed: false, block: true, - width: 120 + width: 80 }, { key: 'codeInfo', @@ -88,6 +88,7 @@ export default { }], display: ['formA', 'formU', 'table', 'model'], block: true, + width: 80, format: function (cellValue, index) { // 状态 未审核:unaudited;审核中:auditing;审核成功:audit_success;审核被拒绝:audit_failed;已撤回:withdrawn;审核延后:delay; // 发布成功:release_success;发布失败:release_failed @@ -149,7 +150,7 @@ export default { }], display: ['formA', 'formU', 'table', 'model'], fixed: true, - block: true, + block: false, width: 100 }, { @@ -163,7 +164,7 @@ export default { }], display: ['formA', 'formU', 'table', 'model'], fixed: true, - block: true, + block: false, width: 100 }, { @@ -177,7 +178,7 @@ export default { }], display: ['formA', 'formU', 'table', 'model'], fixed: true, - block: true, + block: false, width: 100 }, { @@ -189,9 +190,29 @@ export default { message: '请输入代码描述', trigger: 'blur' }], + option: { + + }, display: ['formA', 'formU', 'model'], - block: true, + block: false, width: 120 + }, + { + key: 'extJson', + title: '小程序配置', + type: 'textarea', + rule: [{ + required: true, + message: '请输入小程序配置', + trigger: 'blur' + }], + option: { + minRows: 5, + maxRows: 8, + rows: 6 + }, + display: ['formA', 'formU', 'model'], + block: false } ] } diff --git a/epmet-oper-web/src/main.js b/epmet-oper-web/src/main.js index 3eb15c3..5d787b1 100644 --- a/epmet-oper-web/src/main.js +++ b/epmet-oper-web/src/main.js @@ -1,5 +1,6 @@ import Vue from 'vue' import Element from 'element-ui' + import App from '@/App' import i18n from '@/i18n' import router from '@/router' @@ -41,6 +42,7 @@ Vue.use(renProcessMultiple) Vue.use(renProcessStart) Vue.use(renProcessRunning) Vue.use(renProcessDetail) +Vue.use(Element) Vue.use(Element, { size: 'default', diff --git a/epmet-oper-web/src/router/index.js b/epmet-oper-web/src/router/index.js index 51a0be1..650e936 100644 --- a/epmet-oper-web/src/router/index.js +++ b/epmet-oper-web/src/router/index.js @@ -86,10 +86,8 @@ router.beforeEach((to, from, next) => { }).catch(() => { }) // 获取菜单列表, 添加并全局变量保存 http.get('/oper/access/menu/nav').then(({ data: res }) => { - // eslint-disable-next-line - debugger if (res.code !== 0) { - Vue.prototype.$message.error(res.msg) + // Vue.prototype.$message.error(res.msg) return next({ name: 'login' }) } window.SITE_CONFIG['menuList'] = res.data diff --git a/epmet-oper-web/src/views/components/CForm.vue b/epmet-oper-web/src/views/components/CForm.vue index 15f1c8b..8233f80 100644 --- a/epmet-oper-web/src/views/components/CForm.vue +++ b/epmet-oper-web/src/views/components/CForm.vue @@ -241,8 +241,8 @@ @@ -142,11 +150,12 @@ export default { plain: false, methodName: 'submitCode', // 回调方法名称 isShow: function (row) { - if (row.status === 'unaudited' || row.status === 'audit_failed' || row.status === 'withdrawn') { - return true - } else { - return false - } + return true + // if (row.status === 'unaudited' || row.status === 'audit_failed' || row.status === 'withdrawn') { + // return true + // } else { + // return false + // } } }, { @@ -158,11 +167,12 @@ export default { plain: false, methodName: 'showQRCode', // 回调方法名称 isShow: function (row) { - if (row.status === 'unaudited') { - return true - } else { - return false - } + return true + // if (row.status === 'unaudited') { + // return true + // } else { + // return false + // } } }, { @@ -174,11 +184,12 @@ export default { plain: false, methodName: 'submitRecall', // 回调方法名称 isShow: function (row) { - if (row.status === 'auditing') { - return true - } else { - return false - } + return true + // if (row.status === 'auditing') { + // return true + // } else { + // return false + // } } }, { @@ -190,11 +201,12 @@ export default { plain: false, methodName: 'issueCode', // 回调方法名称 isShow: function (row) { - if (row.status === 'audit_success' || row.status === 'release_failed') { - return true - } else { - return false - } + return true + // if (row.status === 'audit_success' || row.status === 'release_failed') { + // return true + // } else { + // return false + // } } }, { @@ -206,11 +218,12 @@ export default { plain: false, methodName: 'submitFailReason', // 回调方法名称 isShow: function (row) { - if (row.status === 'audit_failed') { - return true - } else { - return false - } + return true + // if (row.status === 'audit_failed') { + // return true + // } else { + // return false + // } } }, { @@ -231,6 +244,7 @@ export default { }, optionData: Object, // 审核弹出框相关 + feedbackShow: false, submitDia: { title: '', visible: false @@ -321,7 +335,7 @@ export default { }, computed: { tableHeight () { - return this.clientHeight - 60 - 80 - 80 - 50 + return this.clientHeight - 60 - 80 - 80 - 85 }, ...mapGetters(['clientHeight']) }, @@ -340,7 +354,11 @@ export default { this.commitDia.visible = true }, // 提交审核 - submitCode (id) { + submitCode (row) { + // if (row.status === 'audit_failed') { + this.feedbackShow = true + // } + this.submitDia.title = '提交审核' this.submitDia.visible = true }, diff --git a/epmet-oper-web/src/views/modules/code/SubmitForm.vue b/epmet-oper-web/src/views/modules/code/SubmitForm.vue index 50538f6..c116954 100644 --- a/epmet-oper-web/src/views/modules/code/SubmitForm.vue +++ b/epmet-oper-web/src/views/modules/code/SubmitForm.vue @@ -7,7 +7,7 @@ :model="dataForm" @keyup.enter.native="getDataList()"> +
小程序版本说明和功能解释
 - +
反馈内容，至多200字，只有上个版本被驳回才可填写
+ + + + 选择图片 +
大小2M以内
+ +
@@ -40,7 +105,6 @@ ref="table" :header-cell-style="{color:'#000'}" :data="tableData" - :height="tableHeight" :style="{width: '100%'}" border v-loading="loading" @@ -121,70 +185,39 @@ -