|
|
@@ -492,7 +492,7 @@ class Color extends Start_Controller {
|
|
|
}
|
|
|
//数据排序
|
|
|
$order_str = "id desc";
|
|
|
- $info_list = $this->color->find_all($where,'id,title,state,type,color,lowe,content,img,developer,craft_process,time');
|
|
|
+ $info_list = $this->color->find_all($where,'id,title,state,type,color,lowe,content,gylj,scsx,img,developer,craft_process,time');
|
|
|
foreach ($info_list as $key=>$value)
|
|
|
{
|
|
|
if(empty($value['developer'])){
|
|
|
@@ -541,6 +541,8 @@ class Color extends Start_Controller {
|
|
|
{
|
|
|
$info_list[$key]['type'] = '未选择';
|
|
|
}
|
|
|
+ $info_list[$key]['gylj'] = empty($value['gylj'])?'':$value['gylj'];
|
|
|
+ $info_list[$key]['scsx'] = empty($value['scsx'])?0:$value['scsx'];
|
|
|
/**
|
|
|
$colorimg = explode('|',$value['img']);
|
|
|
$v = $colorimg[0];
|
|
|
@@ -575,6 +577,8 @@ class Color extends Start_Controller {
|
|
|
<td>色号</td>
|
|
|
<td>曲度</td>
|
|
|
<td>备注</td>
|
|
|
+ <td>工艺路径</td>
|
|
|
+ <td>生产时效</td>
|
|
|
<td style='height:100px;width:200px;'>图片</td>
|
|
|
<td>开发人</td>
|
|
|
<td>重要信息提醒</td>
|
|
|
@@ -644,8 +648,10 @@ class Color extends Start_Controller {
|
|
|
|
|
|
//数据排序
|
|
|
$order_str = "id desc";
|
|
|
- $info_list = $this->color->find_all($where,'id,title,state,type,color,lowe,content,img,developer,craft_process,time');
|
|
|
+
|
|
|
|
|
|
+
|
|
|
+ $info_list = $this->color->find_all($where,'id,title,state,type,color,lowe,content,gylj,scsx,img,developer,craft_process,time');
|
|
|
foreach ($info_list as $key=>$value)
|
|
|
{
|
|
|
if(empty($value['developer'])){
|
|
|
@@ -735,9 +741,13 @@ class Color extends Start_Controller {
|
|
|
$str_img .= '</tr></table>';
|
|
|
$info_list[$key]['img'] = $str_img;
|
|
|
$info_list[$key]['time'] = date('Y-m-d H:i:s',$value['time']);
|
|
|
+ $info_list[$key]['gylj'] = empty($value['gylj'])?'':$value['gylj'];
|
|
|
+ $info_list[$key]['scsx'] = empty($value['scsx'])?0:$value['scsx'];
|
|
|
unset($info_list[$key]['id']);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
$title = "新品/新色配图";
|
|
|
|
|
|
|
|
|
@@ -816,7 +826,7 @@ class Color extends Start_Controller {
|
|
|
|
|
|
$str .= "<table border='1' cellspacing='0' style='border-collapse: collapse; font-family: Microsoft Yahei; font-size: 13px;'><col width='150'><col width='80'><col width='100'><col width='50'><col width='50'><col width='150'><col width='80'><col width='100'><col width='120'><col width='600'> ";
|
|
|
$str .= "<tr >"; // 应用固定高度类
|
|
|
- $str .= "<td>标题</td><td>是否在售</td><td>配图类型</td><td>色号</td><td>曲度</td><td>备注</td><td>开发人</td><td>重要信息提醒</td><td>添加时间</td><td width='600'>图片</td>";
|
|
|
+ $str .= "<td>标题</td><td>是否在售</td><td>配图类型</td><td>色号</td><td>曲度</td><td>备注</td><td>工艺路径</td><td>生产时效</td><td>开发人</td><td>重要信息提醒</td><td>添加时间</td><td width='600'>图片</td>";
|
|
|
$str .= "</tr>";
|
|
|
foreach($info_list as $key => $value){
|
|
|
$str .= "<tr class='fixed-height'>"; // 应用固定高度类
|
|
|
@@ -826,6 +836,8 @@ class Color extends Start_Controller {
|
|
|
$str .= "<td>".$value['color']."</td>";
|
|
|
$str .= "<td>".$value['lowe']."</td>";
|
|
|
$str .= "<td>".$value['content']."</td>";
|
|
|
+ $str .= "<td>".$value['gylj']."</td>";
|
|
|
+ $str .= "<td>".$value['scsx']."</td>";
|
|
|
$str .= "<td>".$value['developer']."</td>";
|
|
|
$str .= "<td>".$value['craft_process']."</td>";
|
|
|
$str .= "<td>".$value['time']."</td>";
|