Просмотр исходного кода

Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

cfort 1 год назад
Родитель
Сommit
572a9d13a3

+ 2 - 2
src/views/component/facility/facilityData.vue

@@ -7,8 +7,8 @@
         <el-row type="flex">
             <el-col style="margin:0 0 5px 0">
                 <div class="button">
-                    <el-button v-if="!isCul" type="danger" size="mini" @click="goRemove">删除</el-button>
-                    <el-button v-if="!isCul" type="success" size="mini" @click="goAdd">添加</el-button>
+                    <el-button v-if="!isCul" type="danger" size="mini" icon="el-icon-close" @click="goRemove">删除</el-button>
+                    <el-button v-if="!isCul" type="success" size="mini" icon="el-icon-plus" @click="goAdd">添加</el-button>
                 </div>
             </el-col>
         </el-row>

+ 24 - 18
src/views/component/formTemplate/index.vue

@@ -21,15 +21,15 @@
             <div class="left" :style="{width:initWidth}">
                 <div class="form">
                     <el-form ref="form" label-width="100px" :model="form" :rules="rules">
-                        <el-row type="flex" justify="center" :gutter="20">
-                            <el-col :span="22">
+                        <el-row>
+                            <el-col :span="24">
                                 <el-form-item label="表单名称:" prop="biao_dan_ming_che">
                                     <el-input v-model="form.biao_dan_ming_che" size="mini" placeholder="请输入" />
                                 </el-form-item>
                             </el-col>
                         </el-row>
-                        <el-row type="flex" justify="center" :gutter="20">
-                            <el-col :span="22">
+                        <el-row>
+                            <el-col :span="24">
                                 <el-form-item label="表单模板:" prop="biao_dan_mo_ban_">
                                     <ibps-attachment
                                         v-model="form.biao_dan_mo_ban_"
@@ -42,8 +42,8 @@
                                 </el-form-item>
                             </el-col>
                         </el-row>
-                        <el-row type="flex" justify="center" :gutter="20">
-                            <el-col :span="22">
+                        <el-row>
+                            <el-col :span="24">
                                 <el-form-item label="归档路径:" prop="gui_dang_lu_jing_">
                                     <ibps-custom-dialog
                                         v-model="form.gui_dang_lu_jing_"
@@ -58,8 +58,8 @@
                                 </el-form-item>
                             </el-col>
                         </el-row>
-                        <el-row type="flex" justify="center" :gutter="20">
-                            <el-col :span="22">
+                        <el-row>
+                            <el-col :span="24">
                                 <el-form-item label="审批流程" prop="shen_pi_liu_cheng">
                                     <el-radio-group v-model="form.shen_pi_liu_cheng">
                                         <el-radio label="无需审批">无需审批</el-radio>
@@ -71,16 +71,16 @@
                     </el-form>
                 </div>
                 <div v-show="form.shen_pi_liu_cheng==='需要审批'" class="table">
-                    <el-row type="flex" justify="end">
-                        <el-col :span="1" :pull="1">
-                            <el-button type="success" size="mini" @click="goSubAdd">添加</el-button>
-                        </el-col>
-                        <el-col :span="1" :pull="1" style="margin:0 5px 5px 10px">
-                            <el-button type="danger" size="mini" @click="goSubRemove">删除</el-button>
+                    <el-row>
+                        <el-col :span="24" style="margin:0 0 5px 0">
+                            <div class="button">
+                                <el-button type="danger" size="mini" icon="el-icon-close" @click="goSubRemove">删除</el-button>
+                                <el-button type="success" size="mini" icon="el-icon-plus" @click="goSubAdd">添加</el-button>
+                            </div>
                         </el-col>
                     </el-row>
-                    <el-row type="flex" justify="center" :gutter="20">
-                        <el-col :span="22">
+                    <el-row>
+                        <el-col :span="24">
                             <el-table border :data="subForm" @selection-change="handleSelectionChange">
                                 <el-table-column
                                     width="50"
@@ -140,14 +140,13 @@
                                             v-if="row.yong_hu_lei_xing_==='role'"
                                             v-model="row.chu_li_ren_"
                                             :disabled="false"
-                                            value-key="roleAlias"
                                             placeholder="请选择指定角色"
                                             :multiple="false"
                                         />
                                         <span v-if="row.yong_hu_lei_xing_==='all'">/</span>
                                     </template>
                                 </el-table-column>
-                                <!-- <el-table-column prop="zhi_xing_fang_shi_" label="执行方式" width="100">
+                            <!-- <el-table-column prop="zhi_xing_fang_shi_" label="执行方式" width="100">
                                     <template slot-scope="{row}">
                                         <el-select v-model="row.zhi_xing_fang_shi_" placeholder="请选择" size="mini">
                                             <el-option
@@ -445,6 +444,13 @@ export default {
             .title{
                 margin: 16px 0 6px -16px;
             }
+            .button{
+                display: flex;
+                flex-direction: row-reverse;
+                .el-button{
+                    margin-left: 5px;
+                }
+            }
         }
     }
 }

+ 1 - 1
src/views/system/fasc/facilityEnvConfig.vue

@@ -247,7 +247,7 @@
                                 <el-button type="info" size="mini" icon="el-icon-setting" @click="settingData">使用默认数据</el-button>
                             </div>
                             <div class="search-item" style="width:60px">
-                                <el-button type="danger" size="mini" icon="el-icon-delete" @click="removeItem">删除</el-button>
+                                <el-button type="danger" size="mini" icon="el-icon-close" @click="removeItem">删除</el-button>
                             </div>
                         </div>
                     </div>