Skip to content

Z
zhichan
Commit ebb78e1f by 赵庆
Options

gsb

parent 18c67c00
Showing with 360 additions and 2 deletions
bpo-admin/app/base/controller/impl/etemplateCtl.js
...@@ -45,6 +45,7 @@ class EtemplateCtl extends CtlBase { ...@@ -45,6 +45,7 @@ class EtemplateCtl extends CtlBase {
delete params.ecompany_id; delete params.ecompany_id;
} }
var page = await this.service.signPage(params); var page = await this.service.signPage(params);
console.log(page)
return system.getResult2(page); return system.getResult2(page);
} catch (e) { } catch (e) {
console.log(e); console.log(e);
......
bpo-admin/app/base/controller/impl/etemplatebusiCtl.js 0 → 100644
const CtlBase = require("../ctl.base");
var system = require("../../system");
class EtemplatebusiCtl extends CtlBase {
constructor() {
super(CtlBase.getServiceName(EtemplatebusiCtl));
this.esettleSve = system.getObject("service.esettleSve");
}
async getlist(queryobj, qobj, req) {
var id = qobj.id;
try {
var info = await this.service.getlist(id);
return info;
} catch (e) {
console.log(e);
return system.getErrResult2("您的网络不稳, 请稍后重试");
}
}
async mysave(queryobj, qobj, req) {
try {
let company_id = qobj.company_id;
var busidata = await this.service.getinfo(qobj);
if (busidata.length > 0) {
return system.getErrResult2("公司已添加");
}
if (company_id) {
var list = await this.esettleSve.findcompanyid(company_id);
var etebusi = {
template_type: 1,
template_id: qobj.template_id,
busi_id: company_id,
busi_company_name: list[0].company_name,
};
let busi = await this.service.saveto(etebusi);
if (busi.id > 0) {
return system.getResult2(busi.id);
}
} else {
return system.getErrResult2("保存失败");
}
} catch (e) {
console.log(e);
return system.getErrResult2("您的网络不稳, 请稍后重试");
}
}
async deleteTetId(queryobj, qobj, req) {
try {
let delCout = await this.service.deleteTetId(qobj);
if(delCout == 1){
return system.getResult2(delCout);
}else {
return system.getErrResult2("删除失败");
}
} catch (e) {
console.log(e);
return system.getErrResult2("您的网络不稳, 请稍后重试");
}
}
async suggest(queryobj, qobj, req) {
var name = this.trim(qobj.name);
if (!name) {
return system.getResult2([])
}
var list = await this.esettleSve.suggest(name);
return system.getResult2(list);
}
}
module.exports = EtemplatebusiCtl;
\ No newline at end of file
bpo-admin/app/base/db/impl/etemplatebusiDao.js 0 → 100644
const Dao = require("../dao.base");
class EtemplatebusiDao extends Dao {
constructor() {
super(Dao.getModelName(EtemplatebusiDao));
}
}
module.exports = EtemplatebusiDao;
bpo-admin/app/base/db/models/etemplatebusi.js 0 → 100644
module.exports = (db, DataTypes) => {
return db.define("etemplatebusi", {
template_type:DataTypes.BIGINT,
template_id:DataTypes.BIGINT,
busi_id:DataTypes.BIGINT,
busi_company_name:DataTypes.BIGINT,
},{
paranoid: true,//假的删除
underscored: true,
version: true,
freezeTableName: true,
//freezeTableName: true,
// define the table's name
tableName: 'c_etemplate_busi',
validate: {
},
indexes:[
// Create a unique index on email
// {
// unique: true,
// fields: ['email']
// },
//
// // Creates a gin index on data with the jsonb_path_ops operator
// {
// fields: ['data'],
// using: 'gin',
// operator: 'jsonb_path_ops'
// },
//
// // By default index name will be [table]_[fields]
// // Creates a multi column partial index
// {
// name: 'public_by_author',
// fields: ['author', 'status'],
// where: {
// status: 'public'
// }
// },
//
// // A BTREE index with a ordered field
// {
// name: 'title_index',
// method: 'BTREE',
// fields: ['author', {attribute: 'title', collate: 'en_US', order: 'DESC', length: 5}]
// }
]
});
}
bpo-admin/app/base/service/impl/esettleSve.js
...@@ -770,5 +770,30 @@ class EsettleService extends ServiceBase { ...@@ -770,5 +770,30 @@ class EsettleService extends ServiceBase {
} }
return rs; return rs;
} }
async suggest(name){
if(!name) {
return [];
}
var sql = "SELECT id, company_name FROM `tbl_busi` WHERE company_name LIKE :queryLike ORDER BY id ASC";
var list = await this.settledb.query(sql, {replacements: {queryLike: "%" + name + "%"}});
if(list && list.length > 0) {
list = list[0,0] || [];
}
return list;
}
async findcompanyid(id){
if(!id) {
return [];
}
var sql = "SELECT company_name FROM `tbl_busi` WHERE id = :queryId";
var list = await this.settledb.query(sql, {replacements: {queryId: id}});
if(list && list.length > 0) {
list = list[0,0] || [];
}
return list;
}
} }
module.exports = EsettleService; module.exports = EsettleService;
\ No newline at end of file
bpo-admin/app/base/service/impl/etemplatebusiSve.js 0 → 100644
const ServiceBase = require("../sve.base");
class EtemplatebusiService extends ServiceBase {
constructor() {
super(ServiceBase.getDaoName(EtemplatebusiService));
}
async getlist(id) {
var sql = "SELECT * FROM c_etemplate_busi WHERE template_id = " + id;
var page = await this.customQuery(sql);
return page;
}
async getinfo(qobj) {
var sql = "SELECT * FROM c_etemplate_busi WHERE template_id = " + qobj.template_id + " AND busi_id = " + qobj.company_id;
var page = await this.customQuery(sql);
return page;
}
async deleteTetId(qobj) {
let sql = "DELETE FROM c_etemplate_busi WHERE id = " + qobj.id;
await this.customExecAddOrPutSql(sql);
return 1;
}
async suggest(name, ownerIds) {
return await this.dao.suggest(name, ownerIds);
}
async saveto(etebusi) {
return await this.create(etebusi);
}
}
module.exports = EtemplatebusiService;
\ No newline at end of file
bpo-admin/app/front/vues/pages/etemplateadmin/etemplateadmin.html
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
<el-table-column label="操作" align="center" > <el-table-column label="操作" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<a href="javascript:;" @click="openEdit(scope.row.id)" style="text-decoration: none;color:#59C1A6;font-size: 14px;">修改</a> <a href="javascript:;" @click="openEdit(scope.row.id)" style="text-decoration: none;color:#59C1A6;font-size: 14px;">修改</a>
<a href="javascript:;" @click="relevance(scope.row.id)" style="text-decoration: none;color:#59C1A6;font-size: 14px;">关联</a>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -162,5 +163,55 @@ ...@@ -162,5 +163,55 @@
<el-button :loading="saveLoading" @click="saveTemplate" style="width:120px;height:36px; background:#54C4A7; border-radius:4px;color: #FFFFFF;font-size: 16px;padding-top: 10px;">保存</el-button> <el-button :loading="saveLoading" @click="saveTemplate" style="width:120px;height:36px; background:#54C4A7; border-radius:4px;color: #FFFFFF;font-size: 16px;padding-top: 10px;">保存</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog width="862px" :visible.sync="showrelevances" @close="clearInput">
<div slot="title">
<span style="margin-left:9px;margin-top:-3px;;width:72px; height:25px; font-size:18px; font-family:PingFangSC-Regular; font-weight:400; color:rgba(51,51,51,1); line-height:25px;">关联信息</span>
<div style="width: 862px; height: 1px;background-color: #E3E3E3;margin: 17px 20px 0px -20px"></div>
</div>
<el-form :model="etemplatebusi" :rules="rules" ref="etemplatebusi" label-width="85px" label="right" style="padding:0px 100px;" >
<el-form-item label="公司：" prop="company_id">
<el-select
v-model="etemplatebusi.company_id"
filterable
remote
clearable
reserve-keyword
style="width:420px;float: left;"
placeholder="请搜索公司名称"
@change="nameChange3"
:remote-method="getCompanyNames3"
:loading="nameLoading2">
<el-option
v-for="item in nameList2"
:key="item.id"
:label="item.company_name"
:value="item.id">
<span style="float: left;width:150px;">{{ item.company_name }}--{{ item.id }}</span>
</el-option>
</el-select>
<el-button :loading="saveLoading" @click="saveTemplatebusi" style="width:80px;height:41px; background:#54C4A7; border-radius:4px;color: #FFFFFF;font-size: 16px;padding-top: 10px;">保存</el-button>
</el-form-item>
</el-form>
<el-table :data="busiData">
<el-table-column prop="id" label="序号" :formatter="onColFormater" width="80" align="center" ></el-table-column>
<el-table-column prop="busi_id" label="公司ID" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="busi_company_name" label="公司名称" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column label="操作" align="center" >
<template slot-scope="scope">
<a href="javascript:;" @click="deleteTetId(scope.row.id)" style="text-decoration: none;color:;font-size: 14px;">删除</a>
</template>
</el-table-column>
</el-table>
</el-dialog>
</div> </div>
</gsb-pcpage> </gsb-pcpage>
\ No newline at end of file
bpo-admin/app/front/vues/pages/etemplateadmin/etemplateadmin.js
...@@ -7,9 +7,13 @@ ...@@ -7,9 +7,13 @@
return { return {
etemplate: {isEnabled:true}, etemplate: {isEnabled:true},
etemplatebusi: {isEnabled:true},
editTitle: "新增", editTitle: "新增",
showEdit: false, showEdit: false,
showrelevances: false,
saveLoading: false, saveLoading: false,
busiData:[],
nameLoading: false, nameLoading: false,
nameList: [], nameList: [],
...@@ -34,6 +38,10 @@ ...@@ -34,6 +38,10 @@
{ required: true, message: '请输入公司名称', trigger: 'blur' }, { required: true, message: '请输入公司名称', trigger: 'blur' },
{ validator: validMethod, trigger: 'blur' } { validator: validMethod, trigger: 'blur' }
], ],
company_id : [
{ required: true, message: '请输入公司名称', trigger: 'blur' },
{ validator: validMethod, trigger: 'blur' }
],
ecompanyMainId: [ ecompanyMainId: [
{ required: true, message: '请选择签约主体', trigger: 'blur' }, { required: true, message: '请选择签约主体', trigger: 'blur' },
], ],
...@@ -42,6 +50,7 @@ ...@@ -42,6 +50,7 @@
], ],
a : [], a : [],
}, },
busi_id: 0,
} }
}, },
mounted: function () { mounted: function () {
...@@ -141,12 +150,34 @@ ...@@ -141,12 +150,34 @@
} else { } else {
self.uploadResult = null; self.uploadResult = null;
} }
console.log(self.uploadResult);
} else { } else {
self.$message.warning(d.msg || `您的网络不稳定, 请稍后重试`); self.$message.warning(d.msg || `您的网络不稳定, 请稍后重试`);
} }
}); });
}, },
clearInput(){
this.$refs.etemplatebusi.resetFields();
},
addCompany() {
this.companysForm.bpoCompanyList.push({
companyName: '',
key: Date.now(),
rules: {required: true, message: '公司名称不能为空', trigger: 'blur'},
});
},
getEtemplate_relevance(id) {
var self = this;
this.busi_id = id;
this.$root.postReq("/web/etemplatebusiCtl/getlist", {
id: id,
}).then(function (d) {
self.template_id = id;
self.busiData = d || [];
});
},
toDetail(id) { toDetail(id) {
}, },
openEdit(id) { openEdit(id) {
...@@ -155,11 +186,17 @@ ...@@ -155,11 +186,17 @@
this.editTitle = "修改"; this.editTitle = "修改";
this.getEtemplate(id); this.getEtemplate(id);
} else { } else {
this.editTitle = "修改"; this.editTitle = "新增";
this.etemplate = {isEnabled:true}; this.etemplate = {isEnabled:true};
} }
this.showEdit = true; this.showEdit = true;
}, },
relevance(id){
this.getEtemplate_relevance(id);
this.showrelevances = true;
},
handleSizeChange(val) { handleSizeChange(val) {
this.search.pageSize = val; this.search.pageSize = val;
this.resetSearch(); this.resetSearch();
...@@ -187,6 +224,11 @@ ...@@ -187,6 +224,11 @@
var item = self.nameMap2[val]; var item = self.nameMap2[val];
self.etemplate.ecompany_id = (item || {}).id || ""; self.etemplate.ecompany_id = (item || {}).id || "";
}, },
nameChange3(val) {
var self = this;
var item = self.nameMap2[val];
self.etemplate.ecompany_id = (item || {}).id || "";
},
getCompanyNames(query) { getCompanyNames(query) {
var self = this; var self = this;
self.nameLoading = true; self.nameLoading = true;
...@@ -221,6 +263,23 @@ ...@@ -221,6 +263,23 @@
self.nameLoading2 = false; self.nameLoading2 = false;
}, 15000); }, 15000);
}, },
getCompanyNames3(query) {
var self = this;
self.nameLoading2 = true;
self.$root.postReq("/web/etemplatebusiCtl/suggest", {
name: query
}).then(function (d) {
self.nameLoading2 = false;
self.nameList2 = d.data || [];
self.nameMap2 = [];
for(var item of self.nameList2) {
self.nameMap2[item.name] = item;
}
});
setTimeout(() => {
self.nameLoading2 = false;
}, 15000);
},
clearUpload() { clearUpload() {
var self = this; var self = this;
...@@ -265,6 +324,48 @@ ...@@ -265,6 +324,48 @@
} }
}); });
}, },
saveTemplatebusi() {
var self = this;
self.$refs.etemplatebusi.validate((valid) => {
if (valid) {
self.saveLoading = true;
setTimeout(() => {
self.saveLoading = false;
}, 15000);
self.etemplatebusi.template_id = self.busi_id;
self.$root.postReq("/web/etemplatebusiCtl/mysave", self.etemplatebusi).then(function (d) {
if (d.status == 0) {
self.$message.success(`保存成功`);
self.showEdit = false;
self.getEtemplate_relevance(self.busi_id);
} else {
self.$alert(d.msg || '保存失败', '提示', {
confirmButtonText: '确定',
callback: action => {}
});
}
self.saveLoading = false;
});
} else {
self.saveLoading = false;
return false;
}
});
},
deleteTetId(id){
var self = this;
self.$root.postReq("/web/etemplatebusiCtl/deleteTetId", {
id: id,
}).then(function (d) {
if (d.status == 0) {
self.$message.success(`已删除`);
self.showrelevances = true;
self.getEtemplate_relevance(self.busi_id);
} else {
self.$message.warning(d.msg || `您的网络不稳定, 请稍后重试`);
}
});
}
}, },
vname: "gsb-ecompanyadmin" vname: "gsb-ecompanyadmin"
} }
\ No newline at end of file
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