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

ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -95,6 +95,7 @@ class DeliverybillCtl extends CtlBase {
         robj.clerkName = element.salesman_name;//业务员名称
         robj.clerkPhone = system.decryptStr(element.salesman_phone);//业务员电话
         robj.deliveryName = element.delivery_man_name;//交付人员名称
+        robj.baseInfo.deliveryName = element.delivery_man_name;//交付人员名称
         robj.createdTime = this.timeFormat(element.created_at);//交付单创建时间
         robj.created_at = this.timeFormat(element.created_at);//交付单创建时间-shousuo
         rarr.push(robj);
@@ -164,6 +165,7 @@ class DeliverybillCtl extends CtlBase {
           rarr.baseInfo.clerkName = rs.salesman_name;//业务员名称
           rarr.baseInfo.clerkPhone = system.decryptStr(rs.salesman_phone);//业务员电话
           rarr.deliveryName = rs.delivery_man_name;//交付人员名称
+          rarr.baseInfo.deliveryName = rs.delivery_man_name;//交付人员名称
           rarr.baseInfo.sellingPrice = this.FenToYuan(rs.selling_price);//价格
           rarr.baseInfo.costPrice = this.FenToYuan(rs.cost_price);//成本价
           rarr.baseInfo.deliverStatus = rs.delivery_status;//状态

ic-deliver/app/base/db/metadata/app/platform.js

@@ -31,7 +31,9 @@ module.exports = {
                 "ICP":"icp",
                 "EDI":"edi",
                 "ICPANNUALREPORT":"icp年报", 
-                "EDIANNUALREPORT":"edi年报"
+                "EDIANNUALREPORT":"edi年报",
+                "psAgentCase":"园区代理记账",
+                "psSealSevCase": "园区刻章服务"
             },
 
             "businessStatus": {//商机状态
@@ -324,7 +326,9 @@ module.exports = {
                 "/qcfw/icp/":"ICP",
                 "/qcfw/edi/":"EDI",
                 "/qcfw/icpannals/":"ICPANNUALREPORT",
-                "/qcfw/ediannals/":"EDIANNUALREPORT"
+                "/qcfw/ediannals/":"EDIANNUALREPORT",
+                "ic/cpdljz/":"psAgentCase",
+                "ic/cpkzfw/":"psSealSevCase"
             },
             "fdyDict": {//产品反对应关系
                 "companyCase": "/ic/gsreg/",
@@ -341,7 +345,9 @@ module.exports = {
                 "ICP":"/qcfw/icp/",
                 "EDI":"/qcfw/edi/",
                 "ICPANNUALREPORT":"/qcfw/icpannals/",
-                "EDIANNUALREPORT":"/qcfw/ediannals/"
+                "EDIANNUALREPORT":"/qcfw/ediannals/",
+                "psAgentCase":"ic/cpdljz/",
+                "psSealSevCase":"ic/cpkzfw/"
             },
             "ddyDict": {//和庄冰的交付单对应关系
                 "paid": 1,