d

esign-admin/app/base/controller/impl/order/orderCtl.js

@@ -13,7 +13,7 @@ class OrderCtl extends CtlBase {
         this.productSve = system.getObject("service.product.productSve");
         this.productSve = system.getObject("service.product.productSve");
         this.ordersignlogSve = system.getObject("service.order.ordersignlogSve");
         this.ordersignlogSve = system.getObject("service.order.ordersignlogSve");
         this.orderauthlogSve = system.getObject("service.order.orderauthlogSve");
         this.orderauthlogSve = system.getObject("service.order.orderauthlogSve");
-        this.feeSve = system.getObject("service.order.feeSve");
+        this.feeSve = system.getObject("service.fee.feeSve");
     }
     }
 
 
     /**
     /**
@@ -153,7 +153,7 @@ class OrderCtl extends CtlBase {
             }
             }
             let res = await this.orderSve.getEorderById(pobj);
             let res = await this.orderSve.getEorderById(pobj);
             // 计费
             // 计费
-            await this.feeSve.setRowsFee([res.data], "engine_account_id");
+            // await this.feeSve.setRowsFee([res.data], "engine_account_id");
             return res;
             return res;
         }catch (e) {
         }catch (e) {
             console.log(e);
             console.log(e);
@@ -199,7 +199,7 @@ class OrderCtl extends CtlBase {
                 item.product_info = productMap[item.product_id];
                 item.product_info = productMap[item.product_id];
             }
             }
             // 设置计费内容
             // 设置计费内容
-            await this.feeSve.setRowsFee(res.data.rows, "engine_account_id");
+            // await this.feeSve.setRowsFee(res.data.rows, "engine_account_id");
             return res;
             return res;
         }catch (e) {
         }catch (e) {
             console.log(e);
             console.log(e);

esign-admin/app/base/controller/impl/order/ordersignlogCtl.js

@@ -108,6 +108,23 @@ class OrdersignlogCtl extends CtlBase {
         let spendedEnd = date.year() + "-" + tempMonth + '-' + tempDay + " 23:59:59";
         let spendedEnd = date.year() + "-" + tempMonth + '-' + tempDay + " 23:59:59";
         return { spendedBegin,spendedEnd };
         return { spendedBegin,spendedEnd };
     }
     }
+
+    /**
+     * fn:合同列表
+     * @param pobj
+     * @param pobj2
+     * @param req
+     * @param res
+     * @returns {Promise<void>}
+     */
+    async pageEorderContract(pobj, pobj2, req, res){
+        try{
+            return await this.ordersignlogSve.pageEorderContract(pobj);
+        }catch (e) {
+            console.log(e);
+            return system.getResult(null, `系统错误`);
+        }
+    }
 }
 }
 
 
 module.exports = OrdersignlogCtl;
 module.exports = OrdersignlogCtl;
\ No newline at end of file

esign-admin/app/base/controller/impl/product/productCtl.js

@@ -9,7 +9,7 @@ class ProductCtl extends CtlBase {
 
 
   async getPage (pobj, pobj2, req) {
   async getPage (pobj, pobj2, req) {
     try {
     try {
-      let res = await this.prodSve.getPage(pobj)
+      let res = await this.prodSve.getPage(pobj);
       return res
       return res
     } catch (error) {
     } catch (error) {
       return system.getResultFail(500, err.message)
       return system.getResultFail(500, err.message)

esign-admin/app/base/service/impl/order/ordersignlogSve.js

@@ -23,6 +23,15 @@ class UserService extends ServiceBase {
     async pageEorderSignLog(params){
     async pageEorderSignLog(params){
         return await this.callms("sve_order", "pageEorderSignLog", params);
         return await this.callms("sve_order", "pageEorderSignLog", params);
     }
     }
+
+    /**
+     * fn:签署合同列表（分页）
+     * @param params
+     * @returns {Promise<void>}
+     */
+    async pageEorderContract(params){
+        return await this.callms("sve_order", "pageEorderContract", params);
+    }
 }
 }
 
 
 module.exports = UserService;
 module.exports = UserService;
\ No newline at end of file

esign-admin/app/base/system.js

@@ -184,10 +184,11 @@ class System {
 		var path = "/api/op/action/springboard";
 		var path = "/api/op/action/springboard";
 		if (settings.env == "dev") {
 		if (settings.env == "dev") {
 			let local = "http://127.0.0.1";
 			let local = "http://127.0.0.1";
+			let liangwenkai = "http://192.168.210.210";
 			let dev = "http://39.107.234.14";
 			let dev = "http://39.107.234.14";
 			return {
 			return {
 				// 产品引擎
 				// 产品引擎
-				engine_product: dev + ":3571" + path,
+				engine_product: liangwenkai + ":3571" + path,
 				// 计费引擎
 				// 计费引擎
 				engine_fee: local + ":3572" + path,
 				engine_fee: local + ":3572" + path,
 				// 认证引擎
 				// 认证引擎