Commit 79a77ca1 by 冷斌

update

parent 3fd66f45
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<span class="form-required">*</span> <span class="form-required">*</span>
</div> </div>
</div> </div>
<!--
<div class="control-group"> <div class="control-group">
<label class="control-label">颜色</label> <label class="control-label">颜色</label>
<div class="controls"> <div class="controls">
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<span class="form-required">*</span> 内容为6位颜色16进制色码,点击可选择 <span class="form-required">*</span> 内容为6位颜色16进制色码,点击可选择
</div> </div>
</div> </div>
-->
</fieldset> </fieldset>
<div class="form-actions"> <div class="form-actions">
<button type="submit" class="btn btn-primary js-ajax-submit">{:L('ADD')}</button> <button type="submit" class="btn btn-primary js-ajax-submit">{:L('ADD')}</button>
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
</div> </div>
</div> </div>
<!--
<div class="control-group"> <div class="control-group">
<label class="control-label">颜色</label> <label class="control-label">颜色</label>
<div class="controls"> <div class="controls">
...@@ -24,6 +25,8 @@ ...@@ -24,6 +25,8 @@
<span class="form-required">*</span> 内容为6位颜色16进制色码,点击可选择 <span class="form-required">*</span> 内容为6位颜色16进制色码,点击可选择
</div> </div>
</div> </div>
-->
<input type="hidden" name="addtime" value="{$time}"> <input type="hidden" name="addtime" value="{$time}">
</fieldset> </fieldset>
<div class="form-actions"> <div class="form-actions">
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<span class="form-required">*</span> <span class="form-required">*</span>
</div> </div>
</div> </div>
<!--
<div class="control-group"> <div class="control-group">
<label class="control-label">颜色</label> <label class="control-label">颜色</label>
<div class="controls"> <div class="controls">
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<span class="form-required">*</span> 内容为6位颜色16进制色码,点击可选择 <span class="form-required">*</span> 内容为6位颜色16进制色码,点击可选择
</div> </div>
</div> </div>
-->
</fieldset> </fieldset>
<div class="form-actions"> <div class="form-actions">
<button type="submit" class="btn btn-primary js-ajax-submit">{:L('SAVE')}</button> <button type="submit" class="btn btn-primary js-ajax-submit">{:L('SAVE')}</button>
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
</div> </div>
</div> </div>
<!--
<div class="control-group"> <div class="control-group">
<label class="control-label">颜色</label> <label class="control-label">颜色</label>
<div class="controls"> <div class="controls">
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
<span class="form-required">*</span> 内容为6位颜色16进制色码,点击可选择 <span class="form-required">*</span> 内容为6位颜色16进制色码,点击可选择
</div> </div>
</div> </div>
-->
</fieldset> </fieldset>
<div class="form-actions"> <div class="form-actions">
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<th>排序</th> <th>排序</th>
<th align="center">ID</th> <th align="center">ID</th>
<th>名称</th> <th>名称</th>
<!-- <th>颜色</th>--> <th>颜色</th>
<th align="center">{:L('ACTIONS')}</th> <th align="center">{:L('ACTIONS')}</th>
</tr> </tr>
</thead> </thead>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<td><input name="listorders[{$vo['id']}]" type="text" size="3" value="{$vo['orderno']}" class="input input-order"></td> <td><input name="listorders[{$vo['id']}]" type="text" size="3" value="{$vo['orderno']}" class="input input-order"></td>
<td align="center">{$vo.id}</td> <td align="center">{$vo.id}</td>
<td>{$vo['name']}</td> <td>{$vo['name']}</td>
<!-- <td><input style="width:50px;height:20px;background:#{$vo['colour']};" disabled/></td>--> <td><input style="width:50px;height:20px;background:#{$vo['colour']};" disabled/></td>
<td align="center"> <td align="center">
<a href="{:U('Impression/edit',array('id'=>$vo['id']))}" >编辑</a> <a href="{:U('Impression/edit',array('id'=>$vo['id']))}" >编辑</a>
| |
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<tr> <tr>
<th align="center">ID</th> <th align="center">ID</th>
<th>名称</th> <th>名称</th>
<th>颜色</th> <!-- <th>颜色</th>-->
<th>创建时间</th> <th>创建时间</th>
<th align="center">{:L('ACTIONS')}</th> <th align="center">{:L('ACTIONS')}</th>
</tr> </tr>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<tr> <tr>
<td align="center">{$vo.id}</td> <td align="center">{$vo.id}</td>
<td>{$vo['name']}</td> <td>{$vo['name']}</td>
<td><input style="width:50px;height:20px;background:#{$vo['colour']};" disabled/></td> <!-- <td><input style="width:50px;height:20px;background:#{$vo['colour']};" disabled/></td>-->
<td>{$vo.addtime|date="Y-m-d H:i:s",###}</td> <td>{$vo.addtime|date="Y-m-d H:i:s",###}</td>
<td align="center"> <td align="center">
<a href="{:U('Impression/edit2',array('id'=>$vo['id']))}" >编辑</a> <a href="{:U('Impression/edit2',array('id'=>$vo['id']))}" >编辑</a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment