lvhao 2 дней назад
Родитель
Сommit
656fc67ee7

+ 4 - 1
core/CoreApp/controllers/Shop.php

@@ -73,7 +73,7 @@ class Shop extends Start_Controller {
                 $start = ($page - 1)*$perpage;
             }
             //取得信息列表
-            $info_list = $this->shop->find_all($where,'id,type,shopname,shortname,estimaterate,mustba,shopid,yyid,tb,status',$order_str,$start,$perpage);
+            $info_list = $this->shop->find_all($where,'id,type,shopname,shortname,estimaterate,mustba,shopid,yyid,tb,status,remarks',$order_str,$start,$perpage);
 			 //格式化数据
             foreach ($info_list as $key=>$value) 
 		    {
@@ -96,6 +96,7 @@ class Shop extends Start_Controller {
 				{
 					$info_list[$key]['tb'] = '不同步';
 				}
+				$info_list[$key]['remarks'] = empty($value['remarks'])?"":$value['remarks'];
 
 				if($value['status'] == 0){
 					$info_list[$key]['status'] = 'active';
@@ -147,6 +148,7 @@ class Shop extends Start_Controller {
 			$post['edittime'] = time();
 			$post['addtime'] = time();
 			$post['px'] = $this->input->post('px',true);
+			$post['remarks'] = $this->input->post('remarks',true);
 			$s = $post;
 			$s['id'] = $post['yyid'];
 			$s['name'] = $post['shortname'];
@@ -211,6 +213,7 @@ class Shop extends Start_Controller {
 			$post['uphone'] = $this->input->post('uphone',true);
 			**/
 			$post['px'] = $this->input->post('px',true);
+			$post['remarks'] = $this->input->post('remarks',true);
 			$post['estimaterate'] = $this->input->post('estimaterate',true);
 			$post['userexp'] = $this->input->post('userexp',true);
 			$post['mustba'] = $this->input->post('mustba',true);

+ 1 - 0
template/erp/shop.html

@@ -38,6 +38,7 @@
 <td>用友ID</td>
 <td>是否同步</td>
 <td>店铺状态</td>
+<td>备注</td>
 </tr>
 </table>
 </div>

+ 4 - 0
template/erp/shop_add.html

@@ -204,6 +204,10 @@
 <em>排序:</em>
 <input value="" name="px" type="text">
 </li>
+<li class="length">
+<em>备注:</em>
+<input value="" name="remarks" type="text">
+</li>
 
 <div style="clear:both;"></div>
 </ul>

+ 4 - 0
template/erp/shop_edit.html

@@ -208,6 +208,10 @@
 <em>排序:</em>
 <input value="{$shop['px']}" name="px" type="text">
 </li>
+<li class="length">
+<em>备注:</em>
+<input value="{$shop['remarks']}" name="remarks" type="text">
+</li>
 
 <div style="clear:both;"></div>
 </ul>