Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 6a8938f2 by 朱继来
Options

Merge branch 'zjl_adjust_20181008' into development

parents deef10e9 4fe40439
Inline Side-by-side
Showing with 12 additions and 25 deletions
app/Http/Controllers/AddOrderController.php
...@@ -187,9 +187,9 @@ Class AddOrderController extends Controller ...@@ -187,9 +187,9 @@ Class AddOrderController extends Controller
$invoice = DB::connection('order')->table('lie_taxinfo')->where('tax_id', $tax_id)->first(); $invoice = DB::connection('order')->table('lie_taxinfo')->where('tax_id', $tax_id)->first();
$invoice->province_val = $this->getAddress($invoice->consignee_province); $invoice->province_val = $invoice->consignee_province ? $this->getAddress($invoice->consignee_province) : '';
$invoice->city_val = $this->getAddress($invoice->consignee_city); $invoice->city_val = $invoice->consignee_city ? $this->getAddress($invoice->consignee_city) : '';
$invoice->district_val = $this->getAddress($invoice->consignee_district); $invoice->district_val = $invoice->consignee_district ? $this->getAddress($invoice->consignee_district) : '';
return ['errcode' => 0, 'errmsg' => '', 'data' => $invoice]; return ['errcode' => 0, 'errmsg' => '', 'data' => $invoice];
} }
......
resources/views/addOffline/content.blade.php
...@@ -196,12 +196,9 @@ ...@@ -196,12 +196,9 @@
</tr> </tr>
</thead> </thead>
<tbody></tbody> <tbody></tbody>
<tfoot>
<tr>
<td colspan="9"><textarea name="remark" id="remark" class="form-control" placeholder="填写订单备注信息"></textarea></td>
</tr>
</tfoot>
</table> </table>
<textarea name="remark" id="remark" class="form-control" placeholder="填写订单备注信息"></textarea>
</div> </div>
<!-- 订单金额 --> <!-- 订单金额 -->
......
resources/views/addOnline/content.blade.php
...@@ -124,9 +124,9 @@ ...@@ -124,9 +124,9 @@
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="inv_type" class="radio-inv-type" value="4"> 增值税普通发票 <input type="radio" name="inv_type" class="radio-inv-type" value="4"> 增值税普通发票
</label> </label>
<label class="radio-inline"> <!-- <label class="radio-inline">
<input type="radio" name="inv_type" class="radio-inv-type" value=""> 不开发票 <input type="radio" name="inv_type" class="radio-inv-type" value=""> 不开发票
</label> </label> -->
</div> </div>
</div> </div>
...@@ -342,14 +342,9 @@ ...@@ -342,14 +342,9 @@
</tr> </tr>
</thead> </thead>
<tbody></tbody> <tbody></tbody>
<tfoot>
<tr>
<td colspan="9">
<textarea name="remark" id="remark" class="form-control" placeholder="填写订单备注信息"></textarea>
</td>
</tr>
</tfoot>
</table> </table>
<textarea name="remark" id="remark" class="form-control" placeholder="填写订单备注信息"></textarea>
</div> </div>
</div> </div>
......
resources/views/addOrder/content.blade.php
...@@ -361,15 +361,10 @@ ...@@ -361,15 +361,10 @@
<th width="5%">操作</th> <th width="5%">操作</th>
</tr> </tr>
</thead> </thead>
<tbody></tbody> <tbody></tbody>
<tfoot>
<tr>
<td colspan="9">
<textarea name="remark" id="remark" class="form-control" placeholder="填写订单备注信息"></textarea>
</td>
</tr>
</tfoot>
</table> </table>
<textarea name="remark" id="remark" class="form-control" placeholder="填写订单备注信息"></textarea>
</div> </div>
</div> </div>
......
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 sign in to comment