Skip to content

S
SuperMan
Commit ee1d86fe authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 67a043ad be13bf81
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 27 deletions
src/components/Ticketing/TicketManager.vue
View file @ ee1d86fe
......@@ -3874,6 +3874,10 @@ export default {
this.outerVisible = false;
this.getList();
}
else
{
this.Error(res.message);
}
},
//下载模板文件
getDownList() {
......
src/components/administrative/Diplomaticplat.vue 0 → 100644
View file @ ee1d86fe
<template>
<div class="Diplomaticplat">
<div class="query-box">
<ul>
<li>
<span>
<em>公司</em>
</span>
<el-select filterable v-model="obj.BranchId" >
<el-option label="不限" :value='-1'></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</li>
<li>
<span>
<em>平台名称</em>
</span>
<el-input v-model="obj.Name" placeholder="请输入内容"></el-input>
</li>
<li>
<span>
<em>联系人</em>
</span>
<el-input v-model="obj.Contact" placeholder="请输入内容"></el-input>
</li>
<li>
<span>
<em>联系电话</em>
</span>
<el-input v-model="obj.ContactMobile" placeholder="请输入内容"></el-input>
</li>
<li style="float:right;margin-bottom:10px">
<input
type="button"
class="hollowFixedBtn"
value="查询"
@click="getList()"
>
</li>
<!-- <input
type="button"
class="hollowFixedBtn"
value="新增"
@click="addRule"
>
-->
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>平台名称</th>
<th>联系人</th>
<th>联系电话</th>
<th>是否有合同</th>
<th>合同说明</th>
<th>所属公司</th>
<th>备注</th>
<th>图片</th>
<th>操作人</th>
<th>操作时间</th>
</tr>
<tr v-for="(item,i) in dataList" :key="i">
<td>{{item.Name}}</td>
<td>{{item.Contact}}</td>
<td>{{item.ContactMobile}}</td>
<td>
<span v-if="item.HaveContract==1">是</span>
<span v-if="item.HaveContract==2">否</span>
</td>
<td>{{item.ContraceDateRange}}</td>
<td>{{item.BranchName}}</td>
<td>{{item.Remark}}</td>
<td>
<span v-for="(img,index2) in item.ImageList" :key="index2">
<img :src="img">
</span>
</td>
<td>{{item.CreateBy}}</td>
<td>{{item.CreateDate}}</td>
<!-- <td>
<el-button @click="SetRules(item)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
<el-button @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
</td> -->
</tr>
<tr v-if="dataList.length==0">
<td colspan="9" align="center">暂无数据</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="obj.pageSize" :total='total'>
</el-pagination>
</div>
</template>
<script>
export default {
name: 'Diplomaticplat',
created() {
},
data () {
return {
companyList:[],
loading:false,
dataList:[],
total:0,
obj:{
pageIndex:1,
pageSize:10,
BranchId:'',
Name:'',
Contact:'',
ContactMobile:'',
},
companyListObj:{},
}
},
mounted() {
this.getCompany();
this.getList();
},
methods: {
handleCurrentChange(val) {
this.obj.pageIndex = val;
this.getList();
},
getList(){
this.loading=true;
this.apipost(
"Financial_get_GetDiplomacyPlatformPageList",
this.obj,
res => {
this.loading=false;
console.log("sadfsf",res);
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
}
},
err => {}
);
},
getCompany() {
this.apipost(
"admin_get_BranchGetList",
this.getCompanyMsg,
res => {
if (res.data.resultCode == 1) {
this.companyList = res.data.data;
this.companyList.map(item=>{
this.companyListObj[item.Id]=item.BName;
})
} else {
}
},
err => {}
);
},
},
}
</script>
<style>
</style>
src/components/administrative/XProcessmanagement.vue
View file @ ee1d86fe
......@@ -141,30 +141,10 @@
</div>
</div>
<div class="_cent _cent_zidingyi">
<!-- <div>
<p class="_t _red">
<el-popover
popper-class="detailsIT_Journal"
width="420"
trigger="click">
<div class="InfoChangeLog" v-if="item.CoseTypeList">
<div class="changLog">
<p class="_log_t">适用费用</p>
<div class="_feiyong">
<span class="_bg_greend" v-for="Cose in item.CoseTypeList">{{Cose}}</span>
</div>
<p class="_log_t _log_t_s">注：以上费用类型将会被执行你设定的流程</p>
</div>
</div>
<div v-else>
<p class="_no_liucheng">暂无适用费用！</p>
</div>
<span slot="reference" class="_dt _cu" type="success" icon="iconfont icon-rizhi1">{{item.CoseTypeListLength}}个费用类型</span>
</el-popover>
</p>
<p class="_s">适用费用</p>
</div> -->
<div>
<p class="_t">类型</p>
<p class="_s">{{item.PropertyTypeName}}</p>
</div>
<div>
<p class="_t _cu" v-if="item.FinanceFlowConnectType!=3">
<!-- <template v-for="(cp,ci) in item.SuitableObjectNameList">
......
src/components/index.vue
View file @ ee1d86fe
......@@ -1932,20 +1932,23 @@ export default {
null
);
},
refreshSysNoteDate(add) {
refreshSysNoteDate(add) {
this.sysMsgList = [];
if (add) {
this.sysMsgPageIndex = this.sysMsgPageIndex + 1;
}
let userInfo = this.getLocalStorage();
let RBBranchid = userInfo.RB_Branch_id; //集团
let EmployeeId = userInfo.EmployeeId; //员工ID
// todo 实现加载系统通知
//获取消息列表
let msg = {
pageIndex: this.sysMsgPageIndex,
pageSize: "5",
RB_BranchId: parseInt(this.$cookie.get("RB_Branch_id")),
RB_BranchId: RBBranchid,
IsRead: 0,
IsSys: 1,
Recipient: parseInt(this.$cookie.get("EmployeeId")),
Recipient: EmployeeId,
RecPlatform: 2,
Title: "",
Type: "0",
......
src/router/config.js
View file @ ee1d86fe
......@@ -641,6 +641,14 @@ export default {
title: '联盟管理'
},
},
{
path: '/Diplomaticplat', //联盟管理
name: 'Diplomaticplat',
component: resolve => require(['@/components/administrative/Diplomaticplat'], resolve),
meta: {
title: '外交平台'
},
},
{
path: '/XProcessmanagement', //联盟管理
name: 'XProcessmanagement',
......
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