Skip to content

Z
zhichan
Commit 95f73a25 by Sxy
Options

feat: 接入网文

parent ace21987
Showing with 129 additions and 122 deletions
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
......@@ -21,7 +21,7 @@ class DeliverybillCtl extends CtlBase {
}
/*根据用户id获取商机信息，分页获取*/
async findAndCountAll (pobj, qobj, req) {
async findAndCountAll(pobj, qobj, req) {
try {
//TODO 根据业务员id获取该业务员所有交付单列表
if (pobj.search && pobj.search.dateType) {
......@@ -31,11 +31,11 @@ class DeliverybillCtl extends CtlBase {
delete pobj.search.dateType
}
if (pobj.search && pobj.search.businessType) {
pobj.search.product_code=pobj.search.businessType
pobj.search.product_code = pobj.search.businessType
delete pobj.search.businessType
}
if (pobj.search && pobj.search.sourceName) {
pobj.search.source_name=pobj.search.sourceName
pobj.search.source_name = pobj.search.sourceName
delete pobj.search.sourceName
}
......@@ -117,7 +117,7 @@ class DeliverybillCtl extends CtlBase {
}
/*根据交付单编号获取交付单xinxi*/
async findInfoByDeliverCode (mobj, qobj, req) {
async findInfoByDeliverCode(mobj, qobj, req) {
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try {
......@@ -139,7 +139,7 @@ class DeliverybillCtl extends CtlBase {
}
/*根据交付单编号获取交付单详情和材料详情*/
async dealInfo (mobj, qobj, req) {
async dealInfo(mobj, qobj, req) {
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try {
......@@ -265,7 +265,7 @@ class DeliverybillCtl extends CtlBase {
}
}
async updateFileAndStatusByDelivertCode (mobj, qobj, red) {//阿里更新状态和盖章文件
async updateFileAndStatusByDelivertCode(mobj, qobj, red) {//阿里更新状态和盖章文件
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try {
......@@ -275,6 +275,11 @@ class DeliverybillCtl extends CtlBase {
if (pobj.customerMaterial && pobj.customerMaterial != 'undefined') {
pobj.baseInfo.customerMaterial = pobj.customerMaterial;
}
if (pobj.memoInfo && pobj.memoInfo != 'undefined') {
pobj.baseInfo.memoInfo = pobj.memoInfo;
}
if (pobj.deliverStatus !== "closed") {
if (!["userConfirmationWait", "userConfirmationReject"].includes(rs.delivery_status)) {
pobj.deliverStatus = rs.delivery_status;
......@@ -298,7 +303,7 @@ class DeliverybillCtl extends CtlBase {
}
async updatestartTimeByDeliverCode (mobj, qobj, red) {//根据交付单编号更新开始计费时间
async updatestartTimeByDeliverCode(mobj, qobj, red) {//根据交付单编号更新开始计费时间
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.baseInfo.startTime && pobj.baseInfo.startTime != 'undefined') {
try {
......@@ -371,7 +376,7 @@ class DeliverybillCtl extends CtlBase {
}
}
/*根据交付单编号更新交付单状态*/
async updateStatusByDeliverCode (mobj, qobj, req) {
async updateStatusByDeliverCode(mobj, qobj, req) {
var pobj = mobj.d;
console.log("--------------------" + JSON.stringify(pobj));
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.deliverStatus && pobj.deliverStatus != 'undefined') {
......@@ -447,7 +452,7 @@ class DeliverybillCtl extends CtlBase {
}
}
async UpdateofficialSealByDeliverCode (mobj, qobj, req) {//更新营业执照扫描件和公章扫描件
async UpdateofficialSealByDeliverCode(mobj, qobj, req) {//更新营业执照扫描件和公章扫描件
var pobj = mobj.d;
if ((pobj.deliverNumber && pobj.deliverNumber != 'undefined' && ((pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined') || (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined')))) {
try {
......@@ -509,7 +514,7 @@ class DeliverybillCtl extends CtlBase {
}
}
async updateExpressInfoByDeliverCode (mobj, qobj, req) {//更新邮寄信息
async updateExpressInfoByDeliverCode(mobj, qobj, req) {//更新邮寄信息
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.expressInfo && pobj.expressInfo != 'undefined') {
try {
......@@ -560,7 +565,7 @@ class DeliverybillCtl extends CtlBase {
}
/*更新业务员/交付员信息*/
async updateUsermanInfoByDeliverCode (mobj, qobj, req) {
async updateUsermanInfoByDeliverCode(mobj, qobj, req) {
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try {
......@@ -618,7 +623,7 @@ class DeliverybillCtl extends CtlBase {
}
/*根据交付单编号更新交付单详情*/
async updateInfoByDeliverCode (mobj, qobj, req) {//
async updateInfoByDeliverCode(mobj, qobj, req) {//
var pobj = mobj.d;
console.log("根据交付单编号更新交付单详情-------------------------" + JSON.stringify(pobj));
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
......@@ -693,14 +698,14 @@ class DeliverybillCtl extends CtlBase {
}
async settleApplyForTacent (p, q, req) {
async settleApplyForTacent(p, q, req) {
let ids = p.ids
let spname = p.spname
let spid = p.spid
let rtn = await this.service.settleApplyForTacent(ids, p.userid, p.username, spname, spid)
return system.getResult({})
}
async settleApply (p, q, req) {
async settleApply(p, q, req) {
let ids = p.ids
let spname = p.spname
let spid = p.spid
......@@ -708,16 +713,16 @@ class DeliverybillCtl extends CtlBase {
return system.getResult({})
}
async dealAliDeliveryInfo (nobj, qobj, req) {//插入交付单信息-阿里用
async dealAliDeliveryInfo(nobj, qobj, req) {//插入交付单信息-阿里用
var pobj = nobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try {
var res = await this.service.findInfoByDeliverCode(pobj);
if (res) {
if (["received", "userUploadWait"].includes(res.delivery_status)) {
if (["received", "userUploadWait"].includes(res.delivery_status) && pobj.deliverStatus === "collecting") {
// 已接单、待用户上传 ， 第一次 上传 文件
pobj.deliverStatus = "collecting";
} else if (["userConfirmationWait"].includes(res.delivery_status)) {
} else if (["userConfirmationWait"].includes(res.delivery_status) && pobj.deliverStatus === "collecting") {
// 递交文件待确认 ， 驳回后重新提交文件
pobj.deliverStatus = "userConfirmationReject";
} else {
......@@ -741,7 +746,7 @@ class DeliverybillCtl extends CtlBase {
}
/*根据商机编号插入交付单信息*/
async insertInfo (nobj, qobj, req) {//队列的时候用
async insertInfo(nobj, qobj, req) {//队列的时候用
var pobj = nobj.d;
console.log("根据交付单编号更新交付单详情-------------------------" + JSON.stringify(pobj));
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
......@@ -922,7 +927,7 @@ class DeliverybillCtl extends CtlBase {
}
}
/*获取压缩文件的信息 */
async findZipUrlByDeliverCode (mobj, qobj, req) {//
async findZipUrlByDeliverCode(mobj, qobj, req) {//
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try {
......@@ -971,14 +976,14 @@ class DeliverybillCtl extends CtlBase {
}
}
timeFormat (date) {
timeFormat(date) {
let localTime = moment.utc(date).toDate();
localTime = moment(localTime).format("YYYY-MM-DD");
return localTime;
}
//元转分 - 解决精度问题 yuan:要转换的钱，单位元； digit：转换倍数
YuanToFen (yuan, digit) {
YuanToFen(yuan, digit) {
var m = 0,
s1 = yuan.toString(),
s2 = digit.toString();
......@@ -987,7 +992,7 @@ class DeliverybillCtl extends CtlBase {
return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
}
FenToYuan (fen) {
FenToYuan(fen) {
var num = fen;
num = fen * 0.01;
num += '';
......@@ -997,7 +1002,7 @@ class DeliverybillCtl extends CtlBase {
return num;
}
toDecimal2 (x) {
toDecimal2(x) {
var f = parseFloat(x);
if (isNaN(f)) {
return false;
......@@ -1016,7 +1021,7 @@ class DeliverybillCtl extends CtlBase {
}
//time时间n年后的的前一天
oneYearPast (time, n) {
oneYearPast(time, n) {
//var time=new Date();
try {
var year = time.getFullYear() + n;
......@@ -1025,20 +1030,20 @@ class DeliverybillCtl extends CtlBase {
var xx = time.setDate(date);
return moment(new Date(xx)).format('yyyy-MM-DD');
}
catch{
catch {
return "";
}
}
//计算俩日期相差多少天
diffDays (time1, time2) {
diffDays(time1, time2) {
try {
var m1 = moment(time1);
var m2 = moment(time2);
return m2.diff(m1, 'day');
}
catch{
catch {
return "";
}
......
ic-deliver/app/base/db/metadata/app/platform.js
......@@ -28,10 +28,10 @@ module.exports = {
"sealSevCase": "刻章服务",
"icChangeCase": "工商变更",
"ssOpenCase": "社保开户",
"ICP":"icp",
"EDI":"edi",
"ICPANNUALREPORT":"icp年报",
"EDIANNUALREPORT":"edi年报"
"ICP": "icp",
"EDI": "edi",
"ICPANNUALREPORT": "icp年报",
"EDIANNUALREPORT": "edi年报"
},
"businessStatus": {//商机状态
......@@ -147,62 +147,62 @@ module.exports = {
},
"registeredAreaDict": {//注册地区
"110100":"北京",
"310100":"上海",
"330100":"杭州",
"370200":"青岛",
"320500":"苏州",
"330200":"宁波",
"320100":"南京",
"320200":"无锡",
"330300":"温州",
"130100":"石家庄",
"330700":"金华",
"320400":"常州",
"320600":"南通",
"320300":"徐州",
"330400":"嘉兴",
"331000":"台州",
"330600":"绍兴",
"140100":"太原",
"370600":"烟台",
"321000":"扬州",
"440100":"广州",
"440300":"深圳",
"510100":"成都",
"420100":"武汉",
"500100":"重庆",
"410100":"郑州",
"430100":"长沙",
"530100":"昆明",
"610100":"西安",
"441900":"东莞",
"350100":"福州",
"520100":"贵阳",
"360100":"南昌",
"440600":"佛山",
"120100":"天津",
"370100":"济南",
"210100":"沈阳",
"210200":"大连",
"230100":"哈尔滨",
"220100":"长春",
"340100":"合肥",
"410200":"开封",
"321300":"宿迁",
"370783":"寿光",
"442000":"中山",
"420500":"宜昌",
"350200":"厦门",
"350700":"南平"
"110100": "北京",
"310100": "上海",
"330100": "杭州",
"370200": "青岛",
"320500": "苏州",
"330200": "宁波",
"320100": "南京",
"320200": "无锡",
"330300": "温州",
"130100": "石家庄",
"330700": "金华",
"320400": "常州",
"320600": "南通",
"320300": "徐州",
"330400": "嘉兴",
"331000": "台州",
"330600": "绍兴",
"140100": "太原",
"370600": "烟台",
"321000": "扬州",
"440100": "广州",
"440300": "深圳",
"510100": "成都",
"420100": "武汉",
"500100": "重庆",
"410100": "郑州",
"430100": "长沙",
"530100": "昆明",
"610100": "西安",
"441900": "东莞",
"350100": "福州",
"520100": "贵阳",
"360100": "南昌",
"440600": "佛山",
"120100": "天津",
"370100": "济南",
"210100": "沈阳",
"210200": "大连",
"230100": "哈尔滨",
"220100": "长春",
"340100": "合肥",
"410200": "开封",
"321300": "宿迁",
"370783": "寿光",
"442000": "中山",
"420500": "宜昌",
"350200": "厦门",
"350700": "南平"
},
"TaxpayerTypeDict": {//纳税人类型
"smallScaleTaxpayer": "小规模纳税人",
"generalTaxpayer": "一般纳税人"
},
"TaxpayerTypeDictT": {//纳税人类型取反
"小规模纳税人":"smallScaleTaxpayer",
"一般纳税人":"generalTaxpayer",
"小规模纳税人": "smallScaleTaxpayer",
"一般纳税人": "generalTaxpayer",
},
"companyNatureDict": {//公司类型
"limitedLiabilityCompany": "有限责任公司",
......@@ -210,9 +210,9 @@ module.exports = {
"groupLimitedCompany": "集团公司"
},
"companyNatureDictT": {//公司类型取反
"有限责任公司":"limitedLiabilityCompany" ,
"股份有限公司":"incorporatedCompany" ,
"集团公司":"groupLimitedCompany"
"有限责任公司": "limitedLiabilityCompany",
"股份有限公司": "incorporatedCompany",
"集团公司": "groupLimitedCompany"
},
"engagedIndustryDict": {//从事行业
"culturalMedia": "文化传媒类",
......@@ -230,19 +230,19 @@ module.exports = {
"engineering": "工程类"
},
"engagedIndustryDictT": {//从事行业取反
"文化传媒类":"culturalMedia" ,
"科技类":"scienceAndTechnology",
"影业类":"filmIndustry" ,
"贸易类":"trade",
"咨询类":"consult" ,
"广告类":"advertisement",
"管理类":"administration" ,
"租赁类":"lease",
"代理类":"proxy" ,
"培训类":"train",
"设计类":"design",
"服务类":"service",
"工程类":"engineering"
"文化传媒类": "culturalMedia",
"科技类": "scienceAndTechnology",
"影业类": "filmIndustry",
"贸易类": "trade",
"咨询类": "consult",
"广告类": "advertisement",
"管理类": "administration",
"租赁类": "lease",
"代理类": "proxy",
"培训类": "train",
"设计类": "design",
"服务类": "service",
"工程类": "engineering"
},
"SealSevCaseDict": {//是否刻章
......@@ -265,25 +265,25 @@ module.exports = {
"company": "有限公司"
},
"registeredTypeDictT": {//个体户类型反
"个体工商":"selfEmployed" ,
"个人独资":"soleProprietorship",
"有限公司":"company"
"个体工商": "selfEmployed",
"个人独资": "soleProprietorship",
"有限公司": "company"
},
"registeredParkDict": {//注册园区
"410200":"开封",
"321300":"宿迁",
"310100":"上海",
"370783":"寿光",
"442000":"中山",
"420500":"宜昌",
"440600":"佛山",
"340100":"合肥",
"510100":"成都",
"500100":"重庆",
"350200":"厦门",
"350700":"南平",
"330100":"杭州",
"441900":"东莞"
"410200": "开封",
"321300": "宿迁",
"310100": "上海",
"370783": "寿光",
"442000": "中山",
"420500": "宜昌",
"440600": "佛山",
"340100": "合肥",
"510100": "成都",
"500100": "重庆",
"350200": "厦门",
"350700": "南平",
"330100": "杭州",
"441900": "东莞"
},
"sealSevTypeDict": {//刻章类型
......@@ -321,10 +321,11 @@ module.exports = {
"/ic/gsnb/": "icCheckCase",
"/ic/gschangs/": "icChangeCase",
"/ic/sbopen/": "ssOpenCase",
"/qcfw/icp/":"ICP",
"/qcfw/edi/":"EDI",
"/qcfw/icpannals/":"ICPANNUALREPORT",
"/qcfw/ediannals/":"EDIANNUALREPORT"
"/qcfw/icp/": "ICP",
"/qcfw/edi/": "EDI",
"/qcfw/icpannals/": "ICPANNUALREPORT",
"/qcfw/ediannals/": "EDIANNUALREPORT",
"wangwen": "wangwen"
},
"fdyDict": {//产品反对应关系
"companyCase": "/ic/gsreg/",
......@@ -338,10 +339,11 @@ module.exports = {
"icCheckCase": "/ic/gsnb/",
"icChangeCase": "/ic/gschangs/",
"ssOpenCase": "/ic/sbopen/",
"ICP":"/qcfw/icp/",
"EDI":"/qcfw/edi/",
"ICPANNUALREPORT":"/qcfw/icpannals/",
"EDIANNUALREPORT":"/qcfw/ediannals/"
"ICP": "/qcfw/icp/",
"EDI": "/qcfw/edi/",
"ICPANNUALREPORT": "/qcfw/icpannals/",
"EDIANNUALREPORT": "/qcfw/ediannals/",
"wangwen": "wangwen"
},
"ddyDict": {//和庄冰的交付单对应关系
"paid": 1,
......
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