Skip to content

S
saas-manage
Commit 6a514796 by zhuzhequan
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !38
parents 98b67a72 13f37328
Showing with 67 additions and 58 deletions
src/views/menu.vue
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<el-form-item label="备注"> <el-form-item label="备注">
<el-input style="width: 220px" v-model="editForm.describe"></el-input> <el-input style="width: 220px" v-model="editForm.describe"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="应用名称"> <!-- <el-form-item label="应用名称">
<el-select <el-select
v-model="editForm.appId" v-model="editForm.appId"
style="width: 400px" style="width: 400px"
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
:label="item.name" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="包含的namespace"> <el-form-item label="包含的namespace">
<el-select <el-select
v-model="editForm.includeNamespace" v-model="editForm.includeNamespace"
...@@ -169,8 +169,7 @@ import { ...@@ -169,8 +169,7 @@ import {
updateMenu, updateMenu,
addMenu, addMenu,
deleteMenu, deleteMenu,
getSimpleByPage, getSimpleByPage
getApplication
} from '../common/api/sys' } from '../common/api/sys'
export default { export default {
...@@ -401,15 +400,15 @@ export default { ...@@ -401,15 +400,15 @@ export default {
enable: true enable: true
} }
} }
getApplication().then((res) => { // getApplication().then((res) => {
if (res.code === 200) { // if (res.code === 200) {
this.applicationList = res.data || [] // this.applicationList = res.data || []
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.editForm && this.$refs.editForm.clearValidate() this.$refs.editForm && this.$refs.editForm.clearValidate()
}) })
this.dialogVisible = true this.dialogVisible = true
} // }
}) // })
}, },
async submit() { async submit() {
try { try {
......
src/views/production/AssistantManage.vue
...@@ -46,65 +46,69 @@ ...@@ -46,65 +46,69 @@
:close-on-click-modal='false' :close-on-click-modal='false'
:before-close='beforeClose' :before-close='beforeClose'
width='1000px' width='1000px'
> >
<el-form <div v-loading="saveLoading">
size='mini' <el-form
:inline='true' size='mini'
label-width='120px' :inline='true'
:rules='rules' label-width='120px'
ref='editForm' :rules='rules'
:model='editForm' ref='editForm'
> :model='editForm'
<el-form-item class="title_width" prop="title" label="更新标题"> >
<el-input type="textarea" v-model="editForm.title" placeholder="请输入更新标题"></el-input> <el-form-item class="title_width" prop="title" label="更新标题">
</el-form-item> <el-input type="textarea" v-model="editForm.title" placeholder="请输入更新标题"></el-input>
<el-form-item class="title_width" prop="content" label="更新内容"> </el-form-item>
<el-input type="textarea" rows="10" v-model="editForm.content" placeholder="请输入更新内容"></el-input> <el-form-item class="title_width" prop="content" label="更新内容">
</el-form-item> <el-input type="textarea" rows="10" v-model="editForm.content" placeholder="请输入更新内容"></el-input>
<el-form-item prop="version" label="版本号">
<el-input class="item_width" v-model="editForm.version" placeholder="请输入版本号"></el-input>
</el-form-item>
<div class="el-row" style="width: 100%;">
<el-form-item class="el-col-11" prop="forcedUpdate" label="是否强制更新">
<el-radio-group class="item_width" v-model="editForm.forcedUpdate">
<el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
<el-form-item class="el-col-11" prop="fullUpdate" label="是否全量更新"> <el-form-item prop="version" label="版本号">
<el-radio-group class="item_width" v-model="editForm.fullUpdate"> <el-input class="item_width" v-model="editForm.version" placeholder="请输入版本号"></el-input>
<el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
</div> <div class="el-row" style="width: 100%;">
<el-form-item class="el-col-11" prop="forcedUpdate" label="是否强制更新">
<el-radio-group class="item_width" v-model="editForm.forcedUpdate">
<el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="el-col-11" prop="fullUpdate" label="是否全量更新">
<el-radio-group class="item_width" v-model="editForm.fullUpdate">
<el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio>
</el-radio-group>
</el-form-item>
</div>
<!-- 上传多个app文件 --> <!-- 上传多个app文件 -->
<el-form-item required class="el-col-24" label="上传文件"> <el-form-item required label="上传文件">
<!-- accept=".apk,.ipa" --> <!-- accept=".apk,.ipa" -->
<el-upload <el-upload
action action
:http-request="handleCustom" :http-request="handleCustom"
:multiple="false" :multiple="false"
:on-change="handleChange" :on-change="handleChange"
:on-remove="handleRemove" :on-remove="handleRemove"
:file-list="fileList" :file-list="fileList"
list-type="text" list-type="text"
> >
<el-button type="primary"> <el-button type="primary">
上传文件 上传文件
</el-button> </el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div>
<div slot='footer'> <div slot='footer'>
<el-button size='small' @click='clone' <el-button :disabled="saveLoading" size='small' @click='clone'
>取 消 >取 消
</el-button </el-button
> >
<el-button <el-button
size='small' size='small'
type='primary' type='primary'
:disabled="saveLoading"
@click='submit' @click='submit'
>保 存 >保 存
</el-button </el-button
...@@ -129,6 +133,7 @@ export default { ...@@ -129,6 +133,7 @@ export default {
data() { data() {
return { return {
loading: false, loading: false,
saveLoading: false,
sourceData: [], sourceData: [],
dialogVisible: false, dialogVisible: false,
editForm: { editForm: {
...@@ -330,6 +335,7 @@ export default { ...@@ -330,6 +335,7 @@ export default {
message: '请上传文件!' message: '请上传文件!'
}) })
} }
this.saveLoading = true
const productionAssistantParams = this.formFile(this.fileList, { const productionAssistantParams = this.formFile(this.fileList, {
...this.editForm, ...this.editForm,
businessType: 'production_assistant' businessType: 'production_assistant'
...@@ -342,11 +348,15 @@ export default { ...@@ -342,11 +348,15 @@ export default {
type: 'success', type: 'success',
message: '保存成功!' message: '保存成功!'
}) })
this.saveLoading = false
this.resetForm() this.resetForm()
await this.getProductionAssistantList() await this.getProductionAssistantList()
this.dialogVisible = false this.dialogVisible = false
} else {
this.saveLoading = false
} }
} catch (error) { } catch (error) {
this.saveLoading = false
console.log('error:>>', error) console.log('error:>>', error)
} }
} }
...@@ -454,7 +464,7 @@ export default { ...@@ -454,7 +464,7 @@ export default {
border: 1px dashed #d9d9d9; border: 1px dashed #d9d9d9;
} }
:deep() .el-button { .el-button {
font-size: 28px; font-size: 28px;
color: #8c939d; color: #8c939d;
text-align: center; text-align: center;
......
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