dever 6 lat temu
rodzic
commit
e0b6e25a80
2 zmienionych plików z 7 dodań i 7 usunięć
  1. 2 2
      code/database/info.php
  2. 5 5
      code/lib/Manage.php

+ 2 - 2
code/database/info.php

@@ -286,9 +286,9 @@ return array
 
         'list_button' => array
 		(
-			'oper' => array('作废', 'code/lib/manage.drop?id={id}&journal_id={product_id}', '{type} == 1'),
+			'oper' => array('作废', 'code/lib/manage.drop?id={id}&journal_id={product_id}&code={code}', '{type} == 1'),
 
-			'oper2' => array('恢复使用', 'code/lib/manage.recovery?id={id}&journal_id={product_id}', '{type} == 4'),
+			'oper2' => array('恢复使用', 'code/lib/manage.recovery?id={id}&journal_id={product_id}&code={code}', '{type} == 4'),
 		),
 	),
 

+ 5 - 5
code/lib/Manage.php

@@ -96,9 +96,9 @@ class Manage
 	 *
 	 * @return mixed
 	 */
-	public function drop_api($id, $journal_id)
+	public function drop_api($id, $journal_id, $code)
 	{
-		if ($journal_id > 0) {
+		if (!$code && $journal_id > 0) {
 			Dever::setInput('set_product_id', $journal_id);
 		}
 		
@@ -108,12 +108,12 @@ class Manage
 		return 'ok';
 	}
 
-	public function recovery_api($id, $journal_id)
+	public function recovery_api($id, $journal_id, $code)
 	{
-		if ($journal_id > 0) {
+		if (!$code && $journal_id > 0) {
 			Dever::setInput('set_product_id', $journal_id);
 		}
-		
+
 		$update['where_id'] = $id;
 		$update['type'] = 1;
 		Dever::db('code/info')->update($update);