From 182c5162e81be62781fd1f4791ff2a984f1deb52 Mon Sep 17 00:00:00 2001 From: linwenling <3256558519@qq.com> Date: 星期三, 03 五月 2023 17:49:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-ui/src/views/contacts/contactsInfo.vue | 31 ++++++++----------------------- 1 files changed, 8 insertions(+), 23 deletions(-) diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue index cff462e..2011fab 100644 --- a/ruoyi-ui/src/views/contacts/contactsInfo.vue +++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue @@ -2,7 +2,7 @@ <div class="app-container"> <div class="form-header mt"> <h4 class="dt h4">閫氳褰曡缁嗕俊鎭� </h4> - <el-button type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" :disabled="btn">缂栬緫</el-button> + <el-button v-if="isShow" type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button> <!-- <br>--> <!-- <el-button type="primary" class="pt" @click="handleExport"--> <!-- v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>--> @@ -46,7 +46,7 @@ </el-input> </el-form-item> <el-form-item label="鏄惁甯歌仈绯�" prop="isAlways"> - <el-input v-model="formData.isAlways" placeholder="鏄惁甯歌仈绯�" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-input v-model="formData.isAlways === 1 ? '鏄�':'鍚�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> <el-form-item label="澶囨敞锛堟槸鍚﹀瓨鍦ㄩ噾閽卞叧绯伙級" prop="remark"> @@ -98,26 +98,7 @@ </div> </el-upload> - <h4 class="form-header">鍏朵粬闄勪欢 </h4> - <el-upload - action="" - :file-list="fileListOther" - class="upload-demo" - multiple - :on-preview="handlePreview" - :on-remove="handleRemove" - :http-request="requestUpload" - :show-file-list="true" - > - <el-button type="primary">鐐瑰嚮涓婁紶</el-button> - <template #tip> - <div class="el-upload__tip"> - </div> - </template> - - - </el-upload> <el-form-item size="large"> <el-button type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button> @@ -152,7 +133,7 @@ ], dsb:true, btn:false, - + isShow:true, // 閫氳褰曡〃鏍兼暟鎹� contactList: [], @@ -339,7 +320,8 @@ handleEdit() { this.dsb = false - this.btn = true + // this.btn = true + this.isShow=false }, requestUpload(params) { @@ -378,6 +360,9 @@ </script> <style scoped> +.app-container{ + background-color: #FEF7FC; +} .mt { position: relative; -- Gitblit v1.9.1