Commit fc61f4bd by zhaoxiqing

gsb

parent c413900f
...@@ -33,7 +33,7 @@ class EtemplateCtl extends CtlBase { ...@@ -33,7 +33,7 @@ class EtemplateCtl extends CtlBase {
} }
var rs = await this.service.findReadyContracts(obj); var rs = await this.service.findReadyContracts(obj);
return system.getResult2(rs); return system.getResult2(rs);mysave
} }
async signList(queryobj, qobj, req) { async signList(queryobj, qobj, req) {
...@@ -232,6 +232,7 @@ class EtemplateCtl extends CtlBase { ...@@ -232,6 +232,7 @@ class EtemplateCtl extends CtlBase {
template.ecompany_id = qobj.ecompany_id; template.ecompany_id = qobj.ecompany_id;
template.filepath = qobj.filepath; template.filepath = qobj.filepath;
template.remark = qobj.remark || ""; template.remark = qobj.remark || "";
template.undertakes_body = qobj.undertakes_body;
template.isLegal = qobj.isLegal; template.isLegal = qobj.isLegal;
template.ecompanyMainId = ecompanyMain.id; template.ecompanyMainId = ecompanyMain.id;
...@@ -246,6 +247,7 @@ class EtemplateCtl extends CtlBase { ...@@ -246,6 +247,7 @@ class EtemplateCtl extends CtlBase {
template.filepath = qobj.filepath; template.filepath = qobj.filepath;
template.placeholderkey = qobj.placeholderkey; template.placeholderkey = qobj.placeholderkey;
template.remark = qobj.remark || ""; template.remark = qobj.remark || "";
template.undertakes_body = qobj.undertakes_body;
template.isLegal = qobj.isLegal; template.isLegal = qobj.isLegal;
template.ecompanyMainId = ecompanyMain.id; template.ecompanyMainId = ecompanyMain.id;
......
...@@ -8,7 +8,7 @@ module.exports = (db, DataTypes) => { ...@@ -8,7 +8,7 @@ module.exports = (db, DataTypes) => {
ecompanyMainId: DataTypes.INTEGER, ecompanyMainId: DataTypes.INTEGER,
mainId: DataTypes.STRING(64), mainId: DataTypes.STRING(64),
nameA: DataTypes.STRING(50), nameA: DataTypes.STRING(50),
undertakes_body : DataTypes.STRING,
templateid: { templateid: {
type:DataTypes.STRING, // e签宝模板id type:DataTypes.STRING, // e签宝模板id
defaultValue: "" defaultValue: ""
......
...@@ -23,6 +23,9 @@ class EtemplateService extends ServiceBase{ ...@@ -23,6 +23,9 @@ class EtemplateService extends ServiceBase{
if (params.ecompany_id) { if (params.ecompany_id) {
where.ecompany_id = params.ecompany_id; where.ecompany_id = params.ecompany_id;
} }
if (params.undertakes_body) {
where.undertakes_body = params.undertakes_body;
}
if(params.ecompanyIds) { if(params.ecompanyIds) {
where.ecompany_id = { where.ecompany_id = {
......
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
<span style="color:2F2F2F;font-size: 14px;" >模板名称: </span> <span style="color:2F2F2F;font-size: 14px;" >模板名称: </span>
<el-input v-model="search.name" placeholder="请输入模板名称" maxlength="100" clearable style="max-width:200px;height: 36px;" ></el-input> <el-input v-model="search.name" placeholder="请输入模板名称" maxlength="100" clearable style="max-width:200px;height: 36px;" ></el-input>
</div> </div>
<div style="float:left;width: 300px;">
<span style="color:2F2F2F;font-size: 14px;" >代发主体: </span>
<el-input v-model="search.undertakes_body" placeholder="请输入代发主体名称" maxlength="100" clearable style="max-width:200px;height: 36px;" ></el-input>
</div>
<div style="float:left;"> <div style="float:left;">
<span style="color:2F2F2F;font-size: 14px;" >所属公司: </span> <span style="color:2F2F2F;font-size: 14px;" >所属公司: </span>
...@@ -59,6 +63,7 @@ ...@@ -59,6 +63,7 @@
<el-table-column prop="name" label="模板名称" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="name" label="模板名称" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="ecompany.name" label="公司名称" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="ecompany.name" label="公司名称" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="ecompanyMain.alias" label="签约主体" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="ecompanyMain.alias" label="签约主体" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="undertakes_body" label="代发主体" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="begUrl" label="签约地址" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="begUrl" label="签约地址" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column label="二维码" > <el-table-column label="二维码" >
<template slot-scope="scope" > <template slot-scope="scope" >
...@@ -147,6 +152,10 @@ ...@@ -147,6 +152,10 @@
<!-- <el-input v-model="etemplate.nameA" placeholder="请输入签约主体" maxlength="50" style="width:468px;" clearable ></el-input> --> <!-- <el-input v-model="etemplate.nameA" placeholder="请输入签约主体" maxlength="50" style="width:468px;" clearable ></el-input> -->
</el-form-item> </el-form-item>
<el-form-item label="代发主体:" prop="undertakes_body" >
<el-input v-model="etemplate.undertakes_body" placeholder="请输入代发主体名称" maxlength="50" style="width:468px;" clearable ></el-input>
</el-form-item>
<el-form-item label="签约协议:" prop="filepath"> <el-form-item label="签约协议:" prop="filepath">
<gsb-upload3 ref="upload3" v-model="uploadResult" @uploadsuccess="uploadsuccess" :fileList="fileList" filetype="pdf"></gsb-upload3> <gsb-upload3 ref="upload3" v-model="uploadResult" @uploadsuccess="uploadsuccess" :fileList="fileList" filetype="pdf"></gsb-upload3>
......
...@@ -48,6 +48,9 @@ ...@@ -48,6 +48,9 @@
filepath: [ filepath: [
{ required: true, message: '请上传签约协议', trigger: 'blur' }, { required: true, message: '请上传签约协议', trigger: 'blur' },
], ],
undertakes_body: [
{ required: true, message: '请输入代发主体', trigger: 'blur' },
],
a : [], a : [],
}, },
busi_id: 0, busi_id: 0,
......
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