Skip to content

Z
zhichan
Commit 67e50a14 by DESKTOP-7Q3CA17\86137
Options

gsb

parent a6fe728f
Showing with 23 additions and 4 deletions
bpo-admin/app/base/controller/impl/entcontractCtl.js
...@@ -100,18 +100,19 @@ class EntcontractCtl extends CtlBase { ...@@ -100,18 +100,19 @@ class EntcontractCtl extends CtlBase {
fileName: "签约协议" + moment().format("YYYYMMDD") + ".csv", fileName: "签约协议" + moment().format("YYYYMMDD") + ".csv",
rows: page.rows, rows: page.rows,
opts: { opts: {
fields: ['id', 'name', 'eaccount.userName', 'eaccount.mobile', 'eaccount.personsSign', 'eaccount.bankno', 'fileurl'], fields: ['id', 'tenant_name', 'name', 'eaccount.userName', 'eaccount.mobile', 'eaccount.personsSign', 'fileurl'],
unwind: ['ecompany', 'eaccount'], unwind: ['ecompany', 'eaccount'],
unwindBlank: true, unwindBlank: true,
excelStrings: true, excelStrings: true,
}, },
headers: { headers: {
'id': '编号', 'id': '编号',
'tenant_name': '签约商户',
'name': "公司名", 'name': "公司名",
'eaccount.userName': "姓名", 'eaccount.userName': "姓名",
'eaccount.mobile': "手机号", 'eaccount.mobile': "手机号",
'eaccount.personsSign': "身份证", 'eaccount.personsSign': "身份证",
"eaccount.bankno": "银行卡号", // "eaccount.bankno": "银行卡号",
'fileurl': "签约合同" 'fileurl': "签约合同"
}, },
}; };
......
bpo-admin/app/base/db/impl/usereaccountDao.js
...@@ -19,6 +19,11 @@ class UsereaccountDao extends Dao{ ...@@ -19,6 +19,11 @@ class UsereaccountDao extends Dao{
params.ids = condition.ids; params.ids = condition.ids;
} }
if(condition.tenantName) {
sql = sql + " AND tenant_name LIKE :tenantName ";
params.tenantName = "%" + condition.tenantName + "%";
}
if(condition.userName) { if(condition.userName) {
sql = sql + " AND userName LIKE :userName "; sql = sql + " AND userName LIKE :userName ";
params.userName = "%" + condition.userName + "%"; params.userName = "%" + condition.userName + "%";
......
bpo-admin/app/base/db/models/entcontract.js
...@@ -3,6 +3,7 @@ const settings = require("../../../config/settings"); ...@@ -3,6 +3,7 @@ const settings = require("../../../config/settings");
const uiconfig = system.getUiConfig2(settings.wxconfig.appId); const uiconfig = system.getUiConfig2(settings.wxconfig.appId);
module.exports = (db, DataTypes) => { module.exports = (db, DataTypes) => {
return db.define("entcontract", { return db.define("entcontract", {
tenant_name : DataTypes.STRING,
name: DataTypes.STRING, name: DataTypes.STRING,
edocid: DataTypes.STRING, // 合同id edocid: DataTypes.STRING, // 合同id
eflowid: DataTypes.STRING, // 合同流程id eflowid: DataTypes.STRING, // 合同流程id
......
bpo-admin/app/base/service/impl/entcontractSve.js
...@@ -302,9 +302,15 @@ class EntcontractService extends ServiceBase { ...@@ -302,9 +302,15 @@ class EntcontractService extends ServiceBase {
where.eflowstatus = { where.eflowstatus = {
[this.db.Op.in]: params.eflowstatusList [this.db.Op.in]: params.eflowstatusList
}; };
;
} }
if (params.tenantName) {
where.tenant_name = {
[this.db.Op.like]: "%" + params.tenantName + "%"
};
}
if (params.accountName || params.accountMobile || params.accountIdno) { if (params.accountName || params.accountMobile || params.accountIdno) {
var accountIds = await this.usereaccountDao.idsByCondition({ var accountIds = await this.usereaccountDao.idsByCondition({
userName: params.accountName || "", userName: params.accountName || "",
......
bpo-admin/app/front/vues/pages/entcontractall/entcontractall.html
...@@ -25,6 +25,12 @@ ...@@ -25,6 +25,12 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div style="float:left;width: auto;margin-left: 40px;">
<span style="color:2F2F2F;font-size: 14px;" >签约商户： </span>
<el-input v-model="search.tenantName" maxlength="50" clearable style="width:160px;height: 36px;" ></el-input>
</div>
<div style="float:left;width: auto;margin-left: 40px;"> <div style="float:left;width: auto;margin-left: 40px;">
<span style="color:2F2F2F;font-size: 14px;" >客户姓名： </span> <span style="color:2F2F2F;font-size: 14px;" >客户姓名： </span>
<el-input v-model="search.accountName" maxlength="50" clearable style="width:160px;height: 36px;" ></el-input> <el-input v-model="search.accountName" maxlength="50" clearable style="width:160px;height: 36px;" ></el-input>
...@@ -90,8 +96,8 @@ ...@@ -90,8 +96,8 @@
row-style="height:50px;" > row-style="height:50px;" >
<el-table-column prop="id" label="id" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="id" label="id" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="tenant_name" label="签约商户" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column>
<el-table-column prop="name" label="公司名称" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column> <el-table-column prop="name" label="公司名称" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column>
<!-- <el-table-column prop="template.nameA" label="签约主体" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column>-->
<el-table-column prop="eaccount.userName" label="姓名" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="eaccount.userName" label="姓名" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="eaccount.mobile" label="手机号" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column> <el-table-column prop="eaccount.mobile" label="手机号" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column>
<el-table-column prop="eaccount.personsSign" label="身份证" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="eaccount.personsSign" label="身份证" :formatter="onColFormater" align="center" ></el-table-column>
......
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