|
@@ -558,7 +558,7 @@ class Order
|
|
|
$this->show_goods($process, $info, $role, $result);
|
|
|
|
|
|
|
|
|
- $this->show_agreement($process, $info, $role, $result);
|
|
|
+ $this->show_agreement($process, $info, $role, $sign_pic, $result);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -978,10 +978,10 @@ class Order
|
|
|
}
|
|
|
|
|
|
|
|
|
- private function show_agreement($process, $info, $role, &$result)
|
|
|
+ private function show_agreement($process, $info, $role, $sign_pic, &$result)
|
|
|
{
|
|
|
$table = array();
|
|
|
- $table['head'] = array('合同类型', '合同名称', '合同状态');
|
|
|
+ $table['head'] = array('合同类型', '合同名称', '合同签名', '合同状态');
|
|
|
$table['body'] = array();
|
|
|
$agreement_type = Dever::db('setting/agreement')->config['config_type'];
|
|
|
$agreement_status = Dever::db('agent/member_agreement')->config['status'];
|
|
@@ -994,7 +994,7 @@ class Order
|
|
|
$agreement_info = Dever::db('setting/agreement')->find($v['agreement_id']);
|
|
|
$agreement_status_name = $agreement_status[$v['status']];
|
|
|
|
|
|
- $table['body'][] = array($agreement_type[$agreement_info['type']], Dever::load('agent/lib/agreement')->name($agreement_info, $v, $role, 2), $agreement_status_name);
|
|
|
+ $table['body'][] = array($agreement_type[$agreement_info['type']], Dever::load('agent/lib/agreement')->name($agreement_info, $v, $role, 2), $sign_pic, $agreement_status_name);
|
|
|
}
|
|
|
|
|
|
} else {
|
|
@@ -1011,9 +1011,9 @@ class Order
|
|
|
$table['body'][] = array($agreement_type[$agreement[1]['type']], Dever::load('agent/lib/agreement')->name($agreement[1], $info, $role, 1), $agreement_status_name);
|
|
|
if ($info['order_type'] == 2) {
|
|
|
|
|
|
- $table['body'][] = array($agreement_type[$agreement[2]['type']], Dever::load('agent/lib/agreement')->name($agreement[2], $info, $role, 1), $agreement_status_name);
|
|
|
+ $table['body'][] = array($agreement_type[$agreement[2]['type']], Dever::load('agent/lib/agreement')->name($agreement[2], $info, $role, 1), $sign_pic, $agreement_status_name);
|
|
|
} else {
|
|
|
- $table['body'][] = array($agreement_type[$agreement[4]['type']], Dever::load('agent/lib/agreement')->name($agreement[4], $info, $role, 1), $agreement_status_name);
|
|
|
+ $table['body'][] = array($agreement_type[$agreement[4]['type']], Dever::load('agent/lib/agreement')->name($agreement[4], $info, $role, 1), $sign_pic, $agreement_status_name);
|
|
|
}
|
|
|
}
|
|
|
|