计量单位转换

config/define.php

@@ -78,8 +78,10 @@
     );
 
     define('WEIGHT_LIANG', 1);
+    define('WEIGHT_SHENG', 2);
     $GLOBALS['weight_convert_list'] = array(
-        '两'=> WEIGHT_LIANG,
+        WEIGHT_LIANG => '两',
+        WEIGHT_SHENG => '升',
     );
 
     $GLOBALS['weight_list'] = array(

control/admin.php

@@ -173,19 +173,20 @@ class admin extends publicBase {
     }
 
     public function unit_conv() {
-        $this->view['unit_list'] = array_flip($GLOBALS['weight_convert_list']);
+        $this->view['unit_list'] = $GLOBALS['weight_convert_list'];
 
         $unit_type = trim($this->get('unit_type')) + 0;
-        if (!$unit_type) $unit_type = 1;
 
         $m_formula = new mFormula();
-        $this->view['list'] = $m_formula->getUnitConvList($unit_type);
+        $condition = array();
+        if ($unit_type) $condition['unit_type'] = $unit_type;
+        $this->view['list'] = $m_formula->getUnitConvList($condition);
     }
 
     public function ajax_change_unit_conv() {
         $id = $this->post('id') + 0;
         $data = array(
-            'is_delete' => $this->post('is_delete') + 0
+            'status' => $this->post('status') + 0
         );
 
         $m_formula = new mFormula();
@@ -196,7 +197,15 @@ class admin extends publicBase {
     }
 
     public function unit_conv_add() {
-        $this->view['unit_list'] = array_flip($GLOBALS['weight_convert_list']);
+        $this->view['unit_list'] = $GLOBALS['weight_convert_list'];
+
+        $id = $this->get('id');
+        if ($id) {
+            $mformula = new mFormula();
+            $data = $mformula->getUnitConvById($id);
+
+            $this->view['data'] = $data;
+        }
     }
 
     public function ajax_save_unit_conv() {

control/index.php

@@ -331,8 +331,8 @@ class index extends publicBase {
     public function ajax_unit_conv() {
         $uinfo = $this->_check_login();
 
-        $unit_name = '两';
+        $unit_type = WEIGHT_LIANG;
-        $unit_type = $GLOBALS['weight_convert_list'][$unit_name];
+        $unit_name = $GLOBALS['weight_convert_list'][$unit_type];
 
         $m_formula = new mFormula();
         $unit_conv = $m_formula->getUnitTypeConv($unit_type);

data/dFormula.php

@@ -49,7 +49,7 @@ class dFormula extends dBase {
             'unit_type',
             'num',
             'from',
-            'is_delete',
+            'status',
             'create_date',
         ),
         'tcm_user_conv' => array(

model/mFormula.php

@@ -92,7 +92,7 @@ class mFormula extends mBase {
 
         $unit_name = preg_replace('/\d/', '', $num_str);
 
-        $unit_type = $GLOBALS['weight_convert_list'][$unit_name];
+        $unit_type = array_search($unit_name, $GLOBALS['weight_convert_list']);
         if (!$unit_type) return false;
         if (!isset($unit_conv[$unit_type])) return false;
 
@@ -660,19 +660,28 @@ class mFormula extends mBase {
     }
 
     public function getUnitConvByIds($ids) {
-        return $this->obj->selectIn($this->unit_conv, array('id' => $ids), array('sql' => '`is_delete`=?', 'vals' => array(0)));
+        return $this->obj->selectIn($this->unit_conv, array('id' => $ids), array('sql' => '`status`=?', 'vals' => array(0)));
     }
 
     public function getUnitConvById($id) {
-        return $this->obj->select($this->unit_conv, array('sql' => '`id`=? and `is_delete`=?', 'vals' => array($id, 0)));
+        return $this->obj->select($this->unit_conv, array('sql' => '`id`=?', 'vals' => array($id)));
     }
 
     public function getUnitTypeConv($unit_type) {
-        return $this->obj->selectAll($this->unit_conv, array('sql' => '`unit_type`=? and `is_delete`=?', 'vals' => array($unit_type, 0)));
+        return $this->obj->selectAll($this->unit_conv, array('sql' => '`unit_type`=? and `status`=?', 'vals' => array($unit_type, 0)));
     }
 
-    public function getUnitConvList($unit_type) {
+    public function getUnitConvList($condition, $page_num = 1, $page_size = 500) {
-        return $this->obj->selectAll($this->unit_conv, array('sql' => '`unit_type`=?', 'vals' => array($unit_type)));
+        $offset = ($page_num - 1) * $page_size;
+
+        $where = "1=1 ";
+        if (!empty($condition)) {
+            foreach ($condition as $key => $val) {
+                $where .= " and {$key}={$val}";
+            }
+        }
+
+        return $this->obj->selectAll($this->unit_conv, array('sql' => $where, 'vals' => array()), 'id desc ', array($offset, $page_size));
     }
 
     public function updateUnitConv($id, $info) {
@@ -707,7 +716,7 @@ class mFormula extends mBase {
             'unit_type' => $unit_type,
             'num' => $num,
             'from' => $from,
-            'is_delete' => 1,
+            'status' => 1,
         );
 
         if (!$id) {

view/templates/admin/unit_conv.html

@@ -30,8 +30,9 @@
                             <td>
                                 &nbsp;计量单位:&nbsp;
                                 <select id="unit_type" style="width: 100px;">
+                                    <option value="0" {if $smarty.get.unit_type==0}selected{/if}>请选择</option>
                                     {foreach from=$unit_list key=key item=item}
-                                    <option value="{$key}" {if $smarty.get.unit_type==$key}selected{/if}>{$item}</option>
+                                    <option value="{$key}" {if $smarty.get.unit_type==$key}selected{/if}>1{$item}</option>
                                     {/foreach}
                                 </select>
                                 &nbsp;&nbsp;&nbsp;
@@ -70,17 +71,18 @@
                         {foreach from=$list key=key item=item}
                         <tr>
                             <td>{$item.id}</td>
-                            <td>{$unit_list[$item.unit_type]}</td>
+                            <td>1{$unit_list[$item.unit_type]}</td>
                             <td>{$item.num}g</td>
                             <td>{$item.from}</td>
                             <td>
                                 {if $item.is_super == 0}
-                                    {if $item.is_delete == 0}
+                                    {if $item.status == 0}
                                     <a href="javascript:;" onclick="to_disabled({$item.id},1)">禁用</a>
                                     {else}
                                     <a href="javascript:;" onclick="to_disabled({$item.id},0)">启用</a>
                                     {/if}
                                 {/if}
+                                <a href="/admin/unit_conv_add/id/{$item.id}">编辑</a>
                             </td>
                         </tr>
                         {/foreach}
@@ -111,7 +113,7 @@
         location.href = url;
     }
 
-    function to_disabled(id, is_delete) {
+    function to_disabled(id, status) {
         if (!confirm("确定要禁用吗？")) {
             console.log("用户选择了确认");
             return false;
@@ -119,7 +121,7 @@
 
         const data = {
             id: id,
-            is_delete: is_delete,
+            status: status,
         };
 
         $.ajax({

view/templates/admin/unit_conv_add.html

@@ -46,7 +46,7 @@
                                                 <label for="unit_type">计量单位<font color='red'>*</font>：</label>
                                                 <select id="unit_type" name="unit_type" style="width: 100px;">
                                                     {foreach from=$unit_list key=key item=item}
-                                                    <option value="{$key}" {if $data.unit_type==$key}selected{/if}>{$item}</option>
+                                                    <option value="{$key}" {if $data.unit_type==$key}selected{/if}>1{$item}</option>
                                                     {/foreach}
                                                 </select>
                                             </div>