Skip to content

Z
zhichan
Commit ecd3fc5d by Sxy
Options

Merge branch 'ic-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into ic-deliver

parents 43d0adc9 277a2a99
Showing with 264 additions and 38 deletions
ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
...@@ -10,6 +10,7 @@ class BizOptCtl extends CtlBase { ...@@ -10,6 +10,7 @@ class BizOptCtl extends CtlBase {
super("bizchance", CtlBase.getServiceName(BizOptCtl)); super("bizchance", CtlBase.getServiceName(BizOptCtl));
this.schemeService = system.getObject("service.bizchance.schemeSve"); this.schemeService = system.getObject("service.bizchance.schemeSve");
this.logService = system.getObject("service.bizchance.statuslogSve"); this.logService = system.getObject("service.bizchance.statuslogSve");
this.shisService = system.getObject("service.bizchance.salesmanhisSve");
this.receiveUrl = settings.receiveUrl(); this.receiveUrl = settings.receiveUrl();
this.queueUrl = settings.queueUrl(); this.queueUrl = settings.queueUrl();
//this.wdyUrl = settings.wdyUrl(); //this.wdyUrl = settings.wdyUrl();
...@@ -127,6 +128,43 @@ class BizOptCtl extends CtlBase { ...@@ -127,6 +128,43 @@ class BizOptCtl extends CtlBase {
} }
} }
/*更新业务员信息*/
async updateSalesmanInfoByDemandCode(mobj, qobj, req){
var pobj = mobj.d;
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.salesmanId && pobj.salesmanId != 'undefined' && pobj.salesmanName && pobj.salesmanName != 'undefined' && pobj.salesmanOpcode && pobj.salesmanOpcode != 'undefined'){
try{
var res = await this.service.findInfoByDemandCode(pobj);
if (res){
var sInfo = {
"flowType": "BIZ",
"flowId": res.id,
"flowCode":pobj.businessMode,
"salesmanInfo":{
"oldOpcode": res.salesman_opcode,
"oldClerkName": res.salesman_name,
"oldClerkId": res.salesman_id,
"newOpcode": pobj.salesmanOpcode,
"newClerkName": pobj.salesmanName,
"newClerkId": pobj.salesmanId
}
}
await this.shisService.insertInfo(sInfo);//之前业务员转历史
await this.service.updateSalesmanInfoByDemandCode(pobj);//更新业务员信息
return system.getResult("操作成功！");
}
else{
return system.getResultError("未找到相关数据");
}
}
catch(error){
return system.getResultError(error);
}
}
else{
return system.getResultError("参数错误!");
}
}
/*根据商机编号更新商机状态*/ /*根据商机编号更新商机状态*/
async updateStatusByDemandCode(mobj, qobj, req) { async updateStatusByDemandCode(mobj, qobj, req) {
var pobj = mobj.d; var pobj = mobj.d;
...@@ -229,7 +267,7 @@ class BizOptCtl extends CtlBase { ...@@ -229,7 +267,7 @@ class BizOptCtl extends CtlBase {
module.exports = BizOptCtl; module.exports = BizOptCtl;
// var task = new BizOptCtl(); // var task = new BizOptCtl();
// var obj={"businessMode":"202006100001","currentStatus":"isClosed","statusReason":"未付款"}; // var obj={"d":{"businessMode":"201111093003","salesmanId":"12","salesmanName":"zhangsan","salesmanOpcode":"root/ic/zhangsan"}};
// task.updateStatusByDemandCode(obj,{},{}).then(d=>{ // task.updateSalesmanInfoByDemandCode(obj,{},{}).then(d=>{
// console.log(d); // console.log(d);
// }) // })
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
...@@ -13,6 +13,7 @@ class DeliverybillCtl extends CtlBase { ...@@ -13,6 +13,7 @@ class DeliverybillCtl extends CtlBase {
this.bizoptService = system.getObject("service.bizchance.bizoptSve"); this.bizoptService = system.getObject("service.bizchance.bizoptSve");
this.logService = system.getObject("service.bizchance.statuslogSve"); this.logService = system.getObject("service.bizchance.statuslogSve");
this.cacheService = system.getObject("service.bizchance.cacheinfoSve"); this.cacheService = system.getObject("service.bizchance.cacheinfoSve");
this.shisService = system.getObject("service.bizchance.salesmanhisSve");
this.receiveUrl = settings.receiveUrl(); this.receiveUrl = settings.receiveUrl();
this.queueUrl = settings.queueUrl(); this.queueUrl = settings.queueUrl();
this.wdyUrl = settings.wdyUrl(); this.wdyUrl = settings.wdyUrl();
...@@ -33,7 +34,7 @@ class DeliverybillCtl extends CtlBase { ...@@ -33,7 +34,7 @@ class DeliverybillCtl extends CtlBase {
const rs = await this.service.findAndCountAll(pobj); const rs = await this.service.findAndCountAll(pobj);
let rarr = []; let rarr = [];
let results = rs.results.rows; let results = rs.results.rows;
console.log("-----------------------------------------" +JSON.stringify(results)); console.log("-----------------------------------------" + JSON.stringify(results));
results.forEach(element => { results.forEach(element => {
let robj = {}; let robj = {};
robj.id = element.id;//数据的id robj.id = element.id;//数据的id
...@@ -48,15 +49,15 @@ class DeliverybillCtl extends CtlBase { ...@@ -48,15 +49,15 @@ class DeliverybillCtl extends CtlBase {
robj.channelNumber = element.source_number;//渠道编码 robj.channelNumber = element.source_number;//渠道编码
robj.facilitator_name = element.facilitator_name;//服务商--前端服务 robj.facilitator_name = element.facilitator_name;//服务商--前端服务
robj.facilitator_id = element.facilitator_id;//服务商--id robj.facilitator_id = element.facilitator_id;//服务商--id
if (element.delivery_info.serviceName && element.delivery_info.serviceName != 'undefined'){ if (element.delivery_info.serviceName && element.delivery_info.serviceName != 'undefined') {
robj.serviceName = element.delivery_info.serviceName; robj.serviceName = element.delivery_info.serviceName;
} }
robj.baseInfo = element.delivery_info;//交付单详情 robj.baseInfo = element.delivery_info;//交付单详情
robj.payStatus = element.delivery_info.payStatus;//交付状态 robj.payStatus = element.delivery_info.payStatus;//交付状态
if (element.pay_status && element.pay_status != 'undefined'){ if (element.pay_status && element.pay_status != 'undefined') {
robj.pay_status = element.pay_status;//交付状态---前端服务 robj.pay_status = element.pay_status;//交付状态---前端服务
} }
else{ else {
robj.pay_status = "";//交付状态---前端服务 robj.pay_status = "";//交付状态---前端服务
} }
...@@ -100,7 +101,7 @@ class DeliverybillCtl extends CtlBase { ...@@ -100,7 +101,7 @@ class DeliverybillCtl extends CtlBase {
rs.results.rows = rarr; rs.results.rows = rarr;
return system.getResult(rs); return system.getResult(rs);
} catch (error) { } catch (error) {
console.log("error-------------------" +error); console.log("error-------------------" + error);
return system.getResultError(error); return system.getResultError(error);
} }
} }
...@@ -512,6 +513,44 @@ class DeliverybillCtl extends CtlBase { ...@@ -512,6 +513,44 @@ class DeliverybillCtl extends CtlBase {
} }
} }
/*更新业务员信息*/
async updateSalesmanInfoByDeliverCode(mobj, qobj, req) {
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.salesmanId && pobj.salesmanId != 'undefined' && pobj.salesmanName && pobj.salesmanName != 'undefined' && pobj.salesmanOpcode && pobj.salesmanOpcode != 'undefined') {
try {
var res = await this.service.findInfoByDeliverCode(pobj);
if (res) {
var sInfo = {
"flowType": "DELIVERY",
"flowId": res.id,
"flowCode": pobj.deliverNumber,
"salesmanInfo": {
"oldOpcode": res.salesman_opcode,
"oldClerkName": res.salesman_name,
"oldClerkId": res.salesman_id,
"newOpcode": pobj.salesmanOpcode,
"newClerkName": pobj.salesmanName,
"newClerkId": pobj.salesmanId
}
}
await this.shisService.insertInfo(sInfo);//之前业务员转历史
await this.service.updateSalesmanInfoByDeliverCode(pobj);//更新业务员信息
return system.getResult("操作成功！");
}
else {
return system.getResultError("未找到相关数据");
}
}
catch (error) {
return system.getResultError(error);
}
}
else {
return system.getResultError("参数错误!");
}
}
/*根据交付单编号更新交付单详情*/ /*根据交付单编号更新交付单详情*/
async updateInfoByDeliverCode(mobj, qobj, req) {// async updateInfoByDeliverCode(mobj, qobj, req) {//
var pobj = mobj.d; var pobj = mobj.d;
...@@ -783,25 +822,25 @@ class DeliverybillCtl extends CtlBase { ...@@ -783,25 +822,25 @@ class DeliverybillCtl extends CtlBase {
if (ms.download_url && ms.download_url != undefined) { if (ms.download_url && ms.download_url != undefined) {
var comInfo = ms.company_info; var comInfo = ms.company_info;
var rtndata = { var rtndata = {
"zipUrl":ms.download_url, "zipUrl": ms.download_url,
"companyName":comInfo.companyName "companyName": comInfo.companyName
} }
if (comInfo.companyProperties == "limitedLiabilityCompany"){ if (comInfo.companyProperties == "limitedLiabilityCompany") {
rtndata.companyProperties = "有限责任公司" rtndata.companyProperties = "有限责任公司"
} }
else if (comInfo.companyProperties == "incorporatedCompany"){ else if (comInfo.companyProperties == "incorporatedCompany") {
rtndata.companyProperties = "股份有限公司" rtndata.companyProperties = "股份有限公司"
} }
else if (comInfo.companyProperties == "groupLimitedCompany"){ else if (comInfo.companyProperties == "groupLimitedCompany") {
rtndata.companyProperties = "集团有限公司" rtndata.companyProperties = "集团有限公司"
} }
else if (comInfo.companyProperties == "selfEmployed"){ else if (comInfo.companyProperties == "selfEmployed") {
rtndata.companyProperties = "个体工商户" rtndata.companyProperties = "个体工商户"
} }
else if (comInfo.companyProperties == "soleProprietorship"){ else if (comInfo.companyProperties == "soleProprietorship") {
rtndata.companyProperties = "个人独资企业" rtndata.companyProperties = "个人独资企业"
} }
else if (comInfo.companyProperties == "company"){ else if (comInfo.companyProperties == "company") {
rtndata.companyProperties = "有限公司" rtndata.companyProperties = "有限公司"
} }
return system.getResult(rtndata); return system.getResult(rtndata);
...@@ -906,8 +945,8 @@ module.exports = DeliverybillCtl; ...@@ -906,8 +945,8 @@ module.exports = DeliverybillCtl;
// // var diff = task.diffDays(ss,oneYear); // // var diff = task.diffDays(ss,oneYear);
// // console.log(oneYear); // // console.log(oneYear);
// // console.log(diff); // // console.log(diff);
// var obj={"d":{"deliverNumber":"1111111"}}; // var obj={"d":{"deliverNumber":"1111111","salesmanId":"12","salesmanName":"zhangsan","salesmanOpcode":"root/ic/zhangsan"}};
// task.findAndCountAll(obj,{},{}).then(d=>{ // task.updateSalesmanInfoByDeliverCode(obj,{},{}).then(d=>{
// console.log(d); // console.log(d);
// //console.log(d[0].analyse); // //console.log(d[0].analyse);
......
ic-deliver/app/base/db/impl/bizchance/bizoptDao.js
...@@ -52,6 +52,17 @@ class BizoptDao extends Dao { ...@@ -52,6 +52,17 @@ class BizoptDao extends Dao {
return await this.updateByWhere(setobj, whereobj, t); return await this.updateByWhere(setobj, whereobj, t);
} }
/*更新业务员信息*/
async updateSalesmanInfoByDemandCode(qobj,t){
var setobj = {
"salesman_id": qobj.salesmanId,
"salesman_name":qobj.salesmanName,
"salesman_opcode":qobj.salesmanOpcode
};
var whereobj = { "demand_code": qobj.businessMode };
return await this.updateByWhere(setobj, whereobj, t);
}
/*插入商机信息*/ /*插入商机信息*/
async insertInfo(qobj, t) { async insertInfo(qobj, t) {
var obj = { var obj = {
......
ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
...@@ -6,13 +6,13 @@ class DeliverybillDao extends Dao { ...@@ -6,13 +6,13 @@ class DeliverybillDao extends Dao {
} }
extraModelFilter(pobj) { extraModelFilter(pobj) {
return {"key":"include","value":{model:this.db.models.settlebill,raw:true,attributes:['memo']}}; return { "key": "include", "value": { model: this.db.models.settlebill, raw: true, attributes: ['memo'] } };
} }
extraWhere(qobj, qw, qc) {//根据业务员id获取交付单信息的组装条件 extraWhere(qobj, qw, qc) {//根据业务员id获取交付单信息的组装条件
//qc.raw = true; //qc.raw = true;
//检查查询的用户所属公司是否是平台运营公司-1,如果是则不添加公司查询条件, 不添加路径条件,返回所有数据 //检查查询的用户所属公司是否是平台运营公司-1,如果是则不添加公司查询条件, 不添加路径条件,返回所有数据
if(qw["delivery_status"]=="handling"){//解决首页多状态查询 if (qw["delivery_status"] == "handling") {//解决首页多状态查询
qw["delivery_status"]= { [this.db.Op.notIn]:['received', 'success', 'closed']} qw["delivery_status"] = { [this.db.Op.notIn]: ['received', 'success', 'closed'] }
} }
if (qobj.company_id == 1) { if (qobj.company_id == 1) {
...@@ -29,8 +29,8 @@ class DeliverybillDao extends Dao { ...@@ -29,8 +29,8 @@ class DeliverybillDao extends Dao {
qw["facilitator_id"] = Number(qobj.company_id) qw["facilitator_id"] = Number(qobj.company_id)
// 为空说明是管理员,不需设置组织结构过滤 // 为空说明是管理员,不需设置组织结构过滤
if (qobj.opath && qobj.opath != "") { if (qobj.opath && qobj.opath != "") {
qw["salesman_opcode"] = { [this.db.Op.like]:`%${qobj.opath}%`} qw["salesman_opcode"] = { [this.db.Op.like]: `%${qobj.opath}%` }
}else{//说明是租户管理员，给租户自己核销结算的功能， } else {//说明是租户管理员，给租户自己核销结算的功能，
if (qobj.bizpath.indexOf("pmxdeliverrequest") > 0) {//说明是结算核销路由过来的 if (qobj.bizpath.indexOf("pmxdeliverrequest") > 0) {//说明是结算核销路由过来的
qw["delivery_status"] = "success"; qw["delivery_status"] = "success";
qw["settle_status"] = "waittosettle"; qw["settle_status"] = "waittosettle";
...@@ -40,7 +40,7 @@ class DeliverybillDao extends Dao { ...@@ -40,7 +40,7 @@ class DeliverybillDao extends Dao {
//不是来自平台前端查询 //不是来自平台前端查询
if (qobj.bizpath && qobj.bizpath.indexOf("pmx") < 0) { if (qobj.bizpath && qobj.bizpath.indexOf("pmx") < 0) {
qc.where.product_code = qc.where.product_code || { qc.where.product_code = qc.where.product_code || {
[this.db.Op.notIn]: ["ICP", "EDI","ICPANNUALREPORT","EDIANNUALREPORT"] [this.db.Op.notIn]: ["ICP", "EDI", "ICPANNUALREPORT", "EDIANNUALREPORT"]
} }
if (qobj.bizpath && qobj.bizpath != "") { if (qobj.bizpath && qobj.bizpath != "") {
if (qobj.bizpath.indexOf("myDeliver") > 0) {//说明是从商机列表过来的 if (qobj.bizpath.indexOf("myDeliver") > 0) {//说明是从商机列表过来的
...@@ -64,19 +64,19 @@ class DeliverybillDao extends Dao { ...@@ -64,19 +64,19 @@ class DeliverybillDao extends Dao {
if (qobj.statusReason && qobj.statusReason != 'undefined') { if (qobj.statusReason && qobj.statusReason != 'undefined') {
setobj.close_reason = qobj.statusReason; setobj.close_reason = qobj.statusReason;
} }
else{ else {
setobj.close_reason = ""; setobj.close_reason = "";
} }
var whereobj = { "delivery_code": qobj.deliverNumber }; var whereobj = { "delivery_code": qobj.deliverNumber };
var rs = await this.findOne(whereobj); var rs = await this.findOne(whereobj);
if (rs && rs != 'undefined'){ if (rs && rs != 'undefined') {
if (qobj.deliverStatus == "collecting" || qobj.deliverStatus == "received" || qobj.deliverStatus == "paid"){ if (qobj.deliverStatus == "collecting" || qobj.deliverStatus == "received" || qobj.deliverStatus == "paid") {
rs.delivery_info.payStatus = "待交付"; rs.delivery_info.payStatus = "待交付";
} }
else if (qobj.deliverStatus == "closed"){ else if (qobj.deliverStatus == "closed") {
rs.delivery_info.payStatus = "已关闭"; rs.delivery_info.payStatus = "已关闭";
} }
else{ else {
rs.delivery_info.payStatus = "已交付"; rs.delivery_info.payStatus = "已交付";
} }
setobj.delivery_info = rs.delivery_info; setobj.delivery_info = rs.delivery_info;
...@@ -84,17 +84,28 @@ class DeliverybillDao extends Dao { ...@@ -84,17 +84,28 @@ class DeliverybillDao extends Dao {
return await this.updateByWhere(setobj, whereobj, t); return await this.updateByWhere(setobj, whereobj, t);
} }
/*更新业务员信息*/
async updateSalesmanInfoByDeliverCode(qobj, t) {
var setobj = {
"salesman_id": qobj.salesmanId,
"salesman_name": qobj.salesmanName,
"salesman_opcode": qobj.salesmanOpcode
};
var whereobj = { "delivery_code": qobj.deliverNumber };
return await this.updateByWhere(setobj, whereobj, t);
}
/*根据交付单更新交付材料信息*/ /*根据交付单更新交付材料信息*/
async updateInfoByDeliverCode(qobj, t) {//公司注册、云上园区注册时填写交付材料 async updateInfoByDeliverCode(qobj, t) {//公司注册、云上园区注册时填写交付材料
var whereobj = { "delivery_code": qobj.deliverNumber }; var whereobj = { "delivery_code": qobj.deliverNumber };
var setobj = { "delivery_info": qobj.baseInfo }; var setobj = { "delivery_info": qobj.baseInfo };
if (qobj.deliverStatus && qobj.deliverStatus != 'undefined'){ if (qobj.deliverStatus && qobj.deliverStatus != 'undefined') {
setobj.delivery_status = qobj.deliverStatus; setobj.delivery_status = qobj.deliverStatus;
} }
if (qobj.statusReason && qobj.statusReason != 'undefined') { if (qobj.statusReason && qobj.statusReason != 'undefined') {
setobj.close_reason = qobj.statusReason; setobj.close_reason = qobj.statusReason;
} }
else{ else {
setobj.close_reason = ""; setobj.close_reason = "";
} }
return await this.updateByWhere(setobj, whereobj, t); return await this.updateByWhere(setobj, whereobj, t);
...@@ -105,12 +116,12 @@ class DeliverybillDao extends Dao { ...@@ -105,12 +116,12 @@ class DeliverybillDao extends Dao {
var obj = { var obj = {
"delivery_code": qobj.deliverNumber, "delivery_code": qobj.deliverNumber,
"delivery_status": qobj.deliverStatus, "delivery_status": qobj.deliverStatus,
"delivery_info":qobj.baseInfo "delivery_info": qobj.baseInfo
}; };
if (qobj.businessMode && qobj.businessMode != 'undefined'){ if (qobj.businessMode && qobj.businessMode != 'undefined') {
obj.demand_code = qobj.businessMode; obj.demand_code = qobj.businessMode;
} }
if (qobj.schemeNumber && qobj.schemeNumber != 'undefined'){ if (qobj.schemeNumber && qobj.schemeNumber != 'undefined') {
obj.scheme_number = qobj.schemeNumber; obj.scheme_number = qobj.schemeNumber;
} }
if (qobj.businessName && qobj.businessName != 'undefined') { if (qobj.businessName && qobj.businessName != 'undefined') {
...@@ -120,8 +131,8 @@ class DeliverybillDao extends Dao { ...@@ -120,8 +131,8 @@ class DeliverybillDao extends Dao {
obj.product_code = qobj.businessType; obj.product_code = qobj.businessType;
} }
if (qobj.txOrderNum && qobj.txOrderNum != 'undefined'){ if (qobj.txOrderNum && qobj.txOrderNum != 'undefined') {
obj.master_source_number= qobj.txOrderNum; obj.master_source_number = qobj.txOrderNum;
} }
if (qobj.channelSource && qobj.channelSource != 'undefined') { if (qobj.channelSource && qobj.channelSource != 'undefined') {
obj.source_name = qobj.channelSource; obj.source_name = qobj.channelSource;
......
ic-deliver/app/base/db/impl/bizchance/salesmanhisDao.js 0 → 100644
const system = require("../../../system");
const Dao = require("../../dao.base");
class SalesmanhisDao extends Dao {
constructor() {
super(Dao.getModelName(SalesmanhisDao));
}
/*插入状态信息信息*/
async insertInfo(qobj,t){
var obj = {
"flow_type":qobj.flowType,
"flow_id":qobj.flowId,
"flow_code":qobj.flowCode,
"salesman_info":qobj.salesmanInfo
};
return await this.create(obj,t);
}
}
module.exports = SalesmanhisDao;
ic-deliver/app/base/db/models/delivery/salesman_his.js 0 → 100644
const system = require("../../../system");
const moment = require('moment');
const settings = require("../../../../config/settings");
const appconfig = system.getSysConfig();
/**
* 方案表
*/
module.exports = (db, DataTypes) => {
return db.define("salesmanhis", {
flow_type: { // 流程类型（商机、方案、交付单）
allowNull: false,
type: DataTypes.STRING
},
flow_id: { //流程对应id（各种表里对应的id）
allowNull: false,
type: DataTypes.STRING
},
flow_code: {//类型的编号
allowNull: false,
type: DataTypes.STRING
},
salesman_info: {//业务员信息
allowNull: false,
type: DataTypes.JSON
}
}, {
paranoid: false,//假的删除
underscored: true,
version: true,
freezeTableName: true,
//freezeTableName: true,
// define the table's name
tableName: 'salesman_his',
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}]
// }
]
});
}
ic-deliver/app/base/service/impl/bizchance/bizoptSve.js
...@@ -90,6 +90,14 @@ class BizOptService extends ServiceBase { ...@@ -90,6 +90,14 @@ class BizOptService extends ServiceBase {
}); });
} }
/*更新业务员信息*/
async updateSalesmanInfoByDemandCode(qobj){
var self = this;
return self.db.transaction(async function (t) {
return await self.dao.updateSalesmanInfoByDemandCode(qobj, t);
});
}
/*插入商机信息*/ /*插入商机信息*/
async insertInfo(qobj) { async insertInfo(qobj) {
var self = this; var self = this;
......
ic-deliver/app/base/service/impl/bizchance/deliverybillSve.js
...@@ -206,7 +206,13 @@ class DeliverybillService extends ServiceBase { ...@@ -206,7 +206,13 @@ class DeliverybillService extends ServiceBase {
return await self.dao.updateStatusByDeliverCode(qobj, t); return await self.dao.updateStatusByDeliverCode(qobj, t);
}); });
} }
/*更新业务员信息*/
async updateSalesmanInfoByDeliverCode(qobj){
var self = this;
return self.db.transaction(async function (t) {
return await self.dao.updateSalesmanInfoByDeliverCode(qobj, t);
});
}
async updateInfoByDeliverCode(qobj) {//*更新交付单信息 */ async updateInfoByDeliverCode(qobj) {//*更新交付单信息 */
console.log("--------------------------------------------------------------------------------------------------------------------------------------"); console.log("--------------------------------------------------------------------------------------------------------------------------------------");
var self = this; var self = this;
......
ic-deliver/app/base/service/impl/bizchance/salesmanhisSve.js 0 → 100644
const system = require("../../../system");
const ServiceBase = require("../../sve.base");
const settings = require("../../../../config/settings");
const appconfig = system.getSysConfig();
class SalesmanhisService extends ServiceBase {
constructor() {
super("bizchance", ServiceBase.getDaoName(SalesmanhisService));
}
/*插入状态信息*/
async insertInfo(qobj){
var self=this;
return self.db.transaction(async function (t) {
return await self.dao.insertInfo(qobj,t);
});
}
}
module.exports = SalesmanhisService;
\ No newline at end of file
ic-deliver/app/front/entry/public/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/ccc.png><title></title><link href=/css/chunk-0ecc464f.e8a7e262.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-168103e5.3623703d.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-37580f15.35fbe31b.css rel=prefetch><link href=/css/chunk-3bb01b7e.a1ef4ffa.css rel=prefetch><link href=/css/chunk-599a3504.1e75f0e2.css rel=prefetch><link href=/css/chunk-69fcc7bb.03f445a2.css rel=prefetch><link href=/css/chunk-6f711436.09462324.css rel=prefetch><link href=/css/chunk-7dc6d142.86cde795.css rel=prefetch><link href=/css/chunk-b07d3c52.5ca8040e.css rel=prefetch><link href=/css/chunk-c1a112d6.f7e9e5eb.css rel=prefetch><link href=/css/chunk-dba5f5e4.c216ed15.css rel=prefetch><link href=/js/chunk-0ecc464f.b56937b3.js rel=prefetch><link href=/js/chunk-14b9857b.1fd9d98f.js rel=prefetch><link href=/js/chunk-168103e5.95104d8c.js rel=prefetch><link href=/js/chunk-2c359864.9aa6a270.js rel=prefetch><link href=/js/chunk-2d0be336.b244bc58.js rel=prefetch><link href=/js/chunk-3385141a.3a737da7.js rel=prefetch><link href=/js/chunk-37580f15.fe2ddb46.js rel=prefetch><link href=/js/chunk-3bb01b7e.a3fbb056.js rel=prefetch><link href=/js/chunk-50ac3ef2.5025c18a.js rel=prefetch><link href=/js/chunk-581ae672.c589178c.js rel=prefetch><link href=/js/chunk-599a3504.56c9798e.js rel=prefetch><link href=/js/chunk-69fcc7bb.066a799a.js rel=prefetch><link href=/js/chunk-6f711436.8c977480.js rel=prefetch><link href=/js/chunk-7dc6d142.a9b7a558.js rel=prefetch><link href=/js/chunk-9ebfd05c.1bc98f0e.js rel=prefetch><link href=/js/chunk-b07d3c52.4f2b646b.js rel=prefetch><link href=/js/chunk-c1a112d6.a37d613b.js rel=prefetch><link href=/js/chunk-dba5f5e4.4c07577c.js rel=prefetch><link href=/js/chunk-f116a998.3387292c.js rel=prefetch><link href=/js/chunk-f285db4a.3c7478e5.js rel=prefetch><link href=/css/app.04d31a64.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.d8c32166.js rel=preload as=script><link href=/js/chunk-vendors.42589dbc.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.04d31a64.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.42589dbc.js></script><script src=/js/app.d8c32166.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/ccc.png><title></title><link href=/css/chunk-0ecc464f.e8a7e262.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-168103e5.3623703d.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-37580f15.35fbe31b.css rel=prefetch><link href=/css/chunk-3bb01b7e.a1ef4ffa.css rel=prefetch><link href=/css/chunk-599a3504.1e75f0e2.css rel=prefetch><link href=/css/chunk-69fcc7bb.03f445a2.css rel=prefetch><link href=/css/chunk-6f711436.09462324.css rel=prefetch><link href=/css/chunk-7dc6d142.86cde795.css rel=prefetch><link href=/css/chunk-b07d3c52.5ca8040e.css rel=prefetch><link href=/css/chunk-c1a112d6.f7e9e5eb.css rel=prefetch><link href=/css/chunk-dba5f5e4.c216ed15.css rel=prefetch><link href=/js/chunk-0ecc464f.b56937b3.js rel=prefetch><link href=/js/chunk-14b9857b.1fd9d98f.js rel=prefetch><link href=/js/chunk-168103e5.95104d8c.js rel=prefetch><link href=/js/chunk-2c359864.9aa6a270.js rel=prefetch><link href=/js/chunk-2d0be336.b244bc58.js rel=prefetch><link href=/js/chunk-3385141a.3a737da7.js rel=prefetch><link href=/js/chunk-37580f15.fe2ddb46.js rel=prefetch><link href=/js/chunk-3bb01b7e.a3fbb056.js rel=prefetch><link href=/js/chunk-50ac3ef2.5025c18a.js rel=prefetch><link href=/js/chunk-581ae672.c3874d87.js rel=prefetch><link href=/js/chunk-599a3504.56c9798e.js rel=prefetch><link href=/js/chunk-69fcc7bb.066a799a.js rel=prefetch><link href=/js/chunk-6f711436.c6de8033.js rel=prefetch><link href=/js/chunk-7dc6d142.a9b7a558.js rel=prefetch><link href=/js/chunk-9ebfd05c.1bc98f0e.js rel=prefetch><link href=/js/chunk-b07d3c52.4f2b646b.js rel=prefetch><link href=/js/chunk-c1a112d6.a37d613b.js rel=prefetch><link href=/js/chunk-dba5f5e4.4c07577c.js rel=prefetch><link href=/js/chunk-f116a998.753945c8.js rel=prefetch><link href=/js/chunk-f285db4a.3c7478e5.js rel=prefetch><link href=/css/app.04d31a64.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.3efb10b4.js rel=preload as=script><link href=/js/chunk-vendors.42589dbc.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.04d31a64.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.42589dbc.js></script><script src=/js/app.3efb10b4.js></script></body></html>
\ No newline at end of file \ No newline at end of file
ic-deliver/app/front/entry/public/js/app.01db66e7.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
ic-deliver/app/front/entry/public/js/app.3efb10b4.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
ic-deliver/app/front/entry/public/js/chunk-581ae672.c3874d87.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-581ae672"],{"391e":function(e,s,i){"use strict";var t=function(){var e=this,s=e.$createElement,i=e._self._c||s;return i("div",{attrs:{id:"framediv"}},[e._t("default",null,{adjustHeight:e.frameHeight})],2)},r=[],a=i("9ee1"),n=a["a"],o=i("9ca4"),u=Object(o["a"])(n,t,r,!1,null,null,null);s["a"]=u.exports},"9ee1":function(e,s,i){"use strict";(function(e){i("163d");s["a"]={name:"pagespace_page",prop:{tweak:Number},data:function(){return{frameHeight:0,advalue:this.tweak?this.tweak:0}},components:{},mounted:function(){var s=this;this.setHeight(),e(window).resize((function(){s.setHeight()}))},methods:{setHeight:function(){var s=this;this.$nextTick((function(){var i=e("#framediv"),t=i.get()[0],r=window.innerHeight-t.offsetTop-s.advalue;s.frameHeight=r,s.$emit("sizechange",s.frameHeight)}))}}}}).call(this,i("a336"))},c9632:function(e,s,i){"use strict";i.r(s);var t=function(){var e=this,s=e.$createElement,i=e._self._c||s;return i("PageSpace",{scopedSlots:e._u([{key:"default",fn:function(s){var t=s.adjustHeight;return[i("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"deliverybill",metaName:"alldeliver_info",packageName:"bizchance",tblheight:t-120,isMulti:"",refvalidatemethod:e.validmethod,savebefore:e.beforesave,editbefore:e.beforedit,addbefore:e.beforeadd},on:{onexec:e.onexec,oninitbtn:e.oninitbtn}}),i("Modal",{attrs:{title:"关闭交付单"},on:{"on-ok":e.ok,"on-cancel":e.cancel},model:{value:e.showCloseTip,callback:function(s){e.showCloseTip=s},expression:"showCloseTip"}},[i("p",[e._v("关闭交付单后将删除该交付信息，是否确定关闭该交付单？")])])]}}])})},r=[],a=i("06d3"),n=i("391e"),o=i("db7f"),u=i("7e1e"),l={name:"mydeliver_page",data:function(){return{showCloseTip:!1,currentDeliverNumber:""}},components:{PageSpace:n["a"],BizTable:a["a"]},methods:{oninitbtn:function(e,s){if("edit"==e.key){var i=!0;"companyCase"!=s.businessType&&"psCase"!=s.businessType||"待交付"==s.payStatus&&(i=!1),e.ishide=i}if("details"==e.key){var t=!0;"companyCase"==s.businessType||"psCase"==s.businessType?"已交付"==s.payStatus&&(t=!1):"已关闭"!==s.payStatus&&(t=!1),e.ishide=t}if("close"==e.key){var r=!0;"待交付"==s.payStatus&&(r=!1),e.ishide=r}},beforeadd:function(e,s){return s({value:!0,message:null})},beforedit:function(e,s){return s({value:!0,message:null})},beforesave:function(e,s,i){return i(s)},onexec:function(e,s){var i=this;"edit"===e&&("companyCase"==s.businessType&&this.$nextTick((function(){i.$router.push({name:"cmpBizDeliverCase",query:{bizType:s.businessType,bizCode:s.deliverNumber}})})),"psCase"==s.businessType&&("selfEmployed"==s.baseInfo.companyProperties&&this.$router.push({name:"psBeliverCase",query:{bizType:s.businessType,bizCode:s.deliverNumber}}),"soleProprietorship"==s.baseInfo.companyProperties&&this.$router.push({name:"psBizBeliverCase",query:{bizType:s.businessType,bizCode:s.deliverNumber}}),"company"==s.baseInfo.companyProperties&&this.$router.push({name:"psCmpBizDeliverCase",query:{bizType:s.businessType,bizCode:s.deliverNumber}}))),"details"===e&&("companyCase"==s.businessType&&this.$router.push({name:"cmpDeliverDetails",query:{bizType:s.businessType,bizCode:s.deliverNumber}}),"psCase"==s.businessType&&("selfEmployed"==s.baseInfo.companyProperties&&this.$router.push({name:"psDeliverDetails",query:{bizType:s.businessType,bizCode:s.deliverNumber}}),"soleProprietorship"==s.baseInfo.companyProperties&&this.$router.push({name:"psBizDeliverDetails",query:{bizType:s.businessType,bizCode:s.deliverNumber}}),"company"==s.baseInfo.companyProperties&&this.$router.push({name:"psCmpDeliverDetails",query:{bizType:s.businessType,bizCode:s.deliverNumber}})),"companyCase"!==s.businessType&&"psCase"!==s.businessType&&this.$router.push({name:"addedSveDeliverDetails",query:{bizType:s.businessType,bizCode:s.deliverNumber}})),"close"===e&&(this.currentDeliverNumber=s.deliverNumber,this.showCloseTip=!0)},validmethod:function(e,s,i){return i()},ok:function(){var e=this;console.log("关闭"+this.currentDeliverNumber+"这个交付单");var s={};s.deliverNumber=this.currentDeliverNumber,s.deliverStatus="closed",Object(u["f"])(s).then((function(s){console.log("deliverStatusUpdateDic result:"+s),e.$refs.bt.fetchData()})).catch((function(e){console.log("deliverStatusUpdateDic err:"+e)})),this.$Message.success("关闭成功")},cancel:function(){this.$Message.info("取消关闭")},formatCol:function(e,s,i){var t=e[s];if("product_code"===s){var r=o["a"].businessType[t];return r}if("pay_status"===s){var a=o["a"].payStatus[t];return a}if("source_name"===s){var n=o["a"].source[t];return n}}}},p=l,c=i("9ca4"),b=Object(c["a"])(p,t,r,!1,null,null,null);s["default"]=b.exports}}]);
\ No newline at end of file
ic-deliver/app/front/entry/public/js/chunk-f116a998.753945c8.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-f116a998"],{"391e":function(e,s,i){"use strict";var t=function(){var e=this,s=e.$createElement,i=e._self._c||s;return i("div",{attrs:{id:"framediv"}},[e._t("default",null,{adjustHeight:e.frameHeight})],2)},r=[],a=i("9ee1"),n=a["a"],o=i("9ca4"),u=Object(o["a"])(n,t,r,!1,null,null,null);s["a"]=u.exports},"9ee1":function(e,s,i){"use strict";(function(e){i("163d");s["a"]={name:"pagespace_page",prop:{tweak:Number},data:function(){return{frameHeight:0,advalue:this.tweak?this.tweak:0}},components:{},mounted:function(){var s=this;this.setHeight(),e(window).resize((function(){s.setHeight()}))},methods:{setHeight:function(){var s=this;this.$nextTick((function(){var i=e("#framediv"),t=i.get()[0],r=window.innerHeight-t.offsetTop-s.advalue;s.frameHeight=r,s.$emit("sizechange",s.frameHeight)}))}}}}).call(this,i("a336"))},ccbb:function(e,s,i){"use strict";i.r(s);var t=function(){var e=this,s=e.$createElement,i=e._self._c||s;return i("PageSpace",{scopedSlots:e._u([{key:"default",fn:function(s){var t=s.adjustHeight;return[i("BizTable",{ref:"bt",attrs:{formatCol:e.formatCol,modelName:"deliverybill",metaName:"alldeliver_info",packageName:"bizchance",tblheight:t-120,isMulti:"",refvalidatemethod:e.validmethod,savebefore:e.beforesave,editbefore:e.beforedit,addbefore:e.beforeadd},on:{onexec:e.onexec,oninitbtn:e.oninitbtn}}),i("Modal",{attrs:{title:"关闭交付单"},on:{"on-ok":e.ok,"on-cancel":e.cancel},model:{value:e.showCloseTip,callback:function(s){e.showCloseTip=s},expression:"showCloseTip"}},[i("p",[e._v("关闭交付单后将删除该交付信息，是否确定关闭该交付单？")])])]}}])})},r=[],a=i("06d3"),n=i("391e"),o=i("db7f"),u=i("7e1e"),l={name:"alldeliver_page",data:function(){return{showCloseTip:!1,currentDeliverNumber:""}},components:{PageSpace:n["a"],BizTable:a["a"]},methods:{oninitbtn:function(e,s){if("edit"==e.key){var i=!0;"companyCase"!=s.businessType&&"psCase"!=s.businessType||"待交付"==s.payStatus&&(i=!1),e.ishide=i}if("details"==e.key){var t=!0;"companyCase"==s.businessType||"psCase"==s.businessType?"已交付"==s.payStatus&&(t=!1):"已关闭"!==s.payStatus&&(t=!1),e.ishide=t}if("close"==e.key){var r=!0;"待交付"==s.payStatus&&(r=!1),e.ishide=r}},beforeadd:function(e,s){return s({value:!0,message:null})},beforedit:function(e,s){return s({value:!0,message:null})},beforesave:function(e,s,i){return i(s)},onexec:function(e,s){var i=this;"edit"===e&&("companyCase"==s.businessType&&this.$nextTick((function(){i.$router.push({name:"cmpBizDeliverCase",query:{bizType:s.businessType,bizCode:s.deliverNumber}})})),"psCase"==s.businessType&&("selfEmployed"==s.baseInfo.companyProperties&&this.$router.push({name:"psBeliverCase",query:{bizType:s.businessType,bizCode:s.deliverNumber}}),"soleProprietorship"==s.baseInfo.companyProperties&&this.$router.push({name:"psBizBeliverCase",query:{bizType:s.businessType,bizCode:s.deliverNumber}}),"company"==s.baseInfo.companyProperties&&this.$router.push({name:"psCmpBizDeliverCase",query:{bizType:s.businessType,bizCode:s.deliverNumber}}))),"details"===e&&("companyCase"==s.businessType&&this.$router.push({name:"cmpDeliverDetails",query:{bizType:s.businessType,bizCode:s.deliverNumber}}),"psCase"==s.businessType&&("selfEmployed"==s.baseInfo.companyProperties&&this.$router.push({name:"psDeliverDetails",query:{bizType:s.businessType,bizCode:s.deliverNumber}}),"soleProprietorship"==s.baseInfo.companyProperties&&this.$router.push({name:"psBizDeliverDetails",query:{bizType:s.businessType,bizCode:s.deliverNumber}}),"company"==s.baseInfo.companyProperties&&this.$router.push({name:"psCmpDeliverDetails",query:{bizType:s.businessType,bizCode:s.deliverNumber}})),"companyCase"!==s.businessType&&"psCase"!==s.businessType&&this.$router.push({name:"addedSveDeliverDetails",query:{bizType:s.businessType,bizCode:s.deliverNumber}})),"close"===e&&(this.currentDeliverNumber=s.deliverNumber,this.showCloseTip=!0)},validmethod:function(e,s,i){return i()},ok:function(){var e=this;console.log("关闭"+this.currentDeliverNumber+"这个交付单");var s={};s.deliverNumber=this.currentDeliverNumber,s.deliverStatus="closed",Object(u["f"])(s).then((function(s){console.log("deliverStatusUpdateDic result:"+s),e.$refs.bt.fetchData()})).catch((function(e){console.log("deliverStatusUpdateDic err:"+e)})),this.$Message.success("关闭成功")},cancel:function(){this.$Message.info("取消关闭")},formatCol:function(e,s,i){var t=e[s];if("product_code"===s){var r=o["a"].businessType[t];return r}if("pay_status"===s){var a=o["a"].payStatus[t];return a}if("source_name"===s){var n=o["a"].source[t];return n}}}},p=l,c=i("9ca4"),b=Object(c["a"])(p,t,r,!1,null,null,null);s["default"]=b.exports}}]);
\ 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