Commit b4562e37 authored by huangyuanyuan's avatar huangyuanyuan

财务和行政部分样式修改

parent bb498f69
...@@ -752,7 +752,7 @@ export default { ...@@ -752,7 +752,7 @@ export default {
let allName = { let allName = {
field: "allName", field: "allName",
title: that.$t('system.query_company'), title: that.$t('system.query_company'),
width: 40, width: 60,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<span><em>标题:</em><el-input v-model='msg.Title' class="permiss-input"></el-input></span> <span><em>标题:</em><el-input v-model='msg.Title' class="permiss-input"></el-input></span>
</li> </li>
<li> <li>
<span><em>发布人:</em><el-select filterable clearable v-model='msg.UpdateBy' placeholder="不限"> <span><em>发布人:</em><el-select filterable clearable v-model='msg.UpdateBy' :placeholder="$t('pub.unlimitedSel')">
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in Employee' <el-option v-for='item in Employee'
:label='item.EmName' :label='item.EmName'
:value='item.EmployeeId' :value='item.EmployeeId'
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
</span> </span>
</li> </li>
<li> <li>
<span><em>发布情况:</em><el-select v-model="msg.Status" placeholder="不限"> <span><em>发布情况:</em><el-select v-model="msg.Status" :placeholder="$t('pub.unlimitedSel')">
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option label='待发布' value='0'></el-option> <el-option label='待发布' value='0'></el-option>
<el-option label='已发布' value='1'></el-option> <el-option label='已发布' value='1'></el-option>
<el-option label='已撤回' value='2'></el-option> <el-option label='已撤回' value='2'></el-option>
...@@ -26,16 +26,16 @@ ...@@ -26,16 +26,16 @@
</span> </span>
</li> </li>
<li> <li>
<span><em>置顶情况:</em><el-select v-model="msg.Is_top" placeholder="不限"> <span><em>置顶情况:</em><el-select v-model="msg.Is_top" :placeholder="$t('pub.unlimitedSel')">
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option label='未置顶' value='0'></el-option> <el-option label='未置顶' value='0'></el-option>
<el-option label='已置顶' value='1'></el-option> <el-option label='已置顶' value='1'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
<input type="button" @click="outerVisible = true,dialogTitle='添加公告',layerType=2,clearMessage()" class="normalBtn" value="新增" /> <input type="button" @click="outerVisible = true,dialogTitle='添加公告',layerType=2,clearMessage()" class="normalBtn" :value="$t('pub.addBtn')" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
<th>主题</th> <th>主题</th>
<th>置顶情况</th> <th>置顶情况</th>
<th>发布情况</th> <th>发布情况</th>
<th>操作人</th> <th width="100">{{$t('admin.admin_czPerson')}}</th>
<th>操作日期</th> <th>操作日期</th>
<th>操作</th> <th width="150">{{$t('admin.admin_operate')}}</th>
</tr> </tr>
<tr v-for="(item,index) in DataList" v-loading='loading'> <tr v-for="(item,index) in DataList" v-loading='loading'>
<td>{{item.Title}}</td> <td>{{item.Title}}</td>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<el-tooltip v-if="item.Status!='0'" class="item" effect="dark" content="详情" placement="top-start"> <el-tooltip v-if="item.Status!='0'" class="item" effect="dark" content="详情" placement="top-start">
<el-button @click='getDetails(item.Id)' type="primary" icon="el-icon-tickets" ></el-button> <el-button @click='getDetails(item.Id)' type="primary" icon="el-icon-tickets" ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.Status=='0'" class="item" effect="dark" content="修改" placement="top-start"> <el-tooltip v-if="item.Status=='0'" class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button @click='updateNotice(item.Id)' type="primary" icon="el-icon-edit" ></el-button> <el-button @click='updateNotice(item.Id)' type="primary" icon="el-icon-edit" ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.Is_top==0&&item.Status=='1'" class="item" effect="dark" content="置顶" placement="top-start"> <el-tooltip v-if="item.Is_top==0&&item.Status=='1'" class="item" effect="dark" content="置顶" placement="top-start">
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<el-tooltip v-if="item.Status=='1'" class="item" effect="dark" content="撤回" placement="top-start"> <el-tooltip v-if="item.Status=='1'" class="item" effect="dark" content="撤回" placement="top-start">
<el-button @click='reCallNotice(item.Id)' type="warning" icon="el-icon-delete"></el-button> <el-button @click='reCallNotice(item.Id)' type="warning" icon="el-icon-delete"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.Status=='0'" class="item" effect="dark" content="删除" placement="top-start"> <el-tooltip v-if="item.Status=='0'" class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button @click='deleteNotice(item.Id)' type="danger" icon="el-icon-delete" ></el-button> <el-button @click='deleteNotice(item.Id)' type="danger" icon="el-icon-delete" ></el-button>
</el-tooltip> </el-tooltip>
</el-button-group> </el-button-group>
...@@ -140,14 +140,14 @@ ...@@ -140,14 +140,14 @@
<div v-if='layerType!=1' slot="footer" class="dialog-footer"> <div v-if='layerType!=1' slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">取消</button> <button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
&nbsp; &nbsp;
<button class="normalBtn" type="primary" @click="submitForm('addMsg',0)">暂存</button> <button class="normalBtn" type="primary" @click="submitForm('addMsg',0)">暂存</button>
&nbsp; &nbsp;
<button class="normalBtn" type="primary" @click="submitForm('addMsg',1)">发布</button> <button class="normalBtn" type="primary" @click="submitForm('addMsg',1)">发布</button>
</div> </div>
<div v-if='layerType==1' slot="footer" class="dialog-footer"> <div v-if='layerType==1' slot="footer" class="dialog-footer">
<button class="normalBtn" @click="outerVisible = false">关闭</button> <button class="normalBtn" @click="outerVisible = false">{{$t('pub.closeSel')}}</button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<span><em>公司</em> <span><em>{{$t('system.table_company')}}</em>
<el-select filterable v-model='msg.RB_BranchId' :placeholder="$t('pub.unlimitedSel')"> <el-select filterable v-model='msg.RB_BranchId' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in companyList' <el-option v-for='item in companyList'
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<td>{{item.AttendanceDate}}</td> <td>{{item.AttendanceDate}}</td>
<td>{{item.UpdateName}}</td> <td>{{item.UpdateName}}</td>
<td> <td>
<el-tooltip class="item" effect="dark" content="修改" placement="right"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="right">
<el-button type="primary" icon="el-icon-edit" @click="goUrl('AttendanceRules',item.Id,item.RB_BranchId)" circle></el-button> <el-button type="primary" icon="el-icon-edit" @click="goUrl('AttendanceRules',item.Id,item.RB_BranchId)" circle></el-button>
</el-tooltip> </el-tooltip>
</td> </td>
......
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