root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[fix] 

销售管理 销售订单
修改业务经理、总经理审批销售订单页面，调整表单显示效果，审批意见和批注移到上部和订单信息分隔开来；
dev
王晓迪 1 month ago
parent
7b9d3d50b6
commit
44dab0e035
2 changed files with 57 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
  2. 51
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

46
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
View File

@ -19,6 +19,12 @@
<input name="instanceId" th:field="*{instanceId}" type="hidden"> <input name="instanceId" th:field="*{instanceId}" type="hidden">
<input name="instanceType" th:field="*{instanceType}" type="hidden"> <input name="instanceType" th:field="*{instanceType}" type="hidden">
<input type="hidden" name="p_COM_comment" /> <input type="hidden" name="p_COM_comment" />
<div class="form-group">
<label class="col-sm-3 control-label is-required">销售订单编号：</label>
<div class="col-sm-8">
<input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required readonly>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">申请人：</label> <label class="col-sm-3 control-label">申请人：</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -46,12 +52,29 @@
<input name="salesOrderID" class="form-control" th:field="*{salesOrderId}" type="number" required > <input name="salesOrderID" class="form-control" th:field="*{salesOrderId}" type="number" required >
</div> </div>
</div> </div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label is-required">销售订单编号：</label> <div class="form-group">
<label class="col-sm-3 control-label" for="ywjlVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required readonly> <select name="p_B_ywjlVerifyApproved" id="ywjlVerifyApproved" class="form-control m-b" required>
<option value=""></option>
<option value="true">同意</option>
<option value="false">拒绝</option>
</select>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">批注：</label>
<div class="col-sm-8">
<textarea name="comment" class="form-control"></textarea>
</div>
</div>
<div class="col-xs-11" style="margin-left: 20px;">
<hr style="border-top: 1px dashed blue;border-bottom: 1px dashed blue;margin-top: 0px;">
<h3 style="margin-top: 0px;">订单信息</h3>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">客户ID：</label> <label class="col-sm-3 control-label is-required">客户ID：</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -251,22 +274,7 @@
<textarea name="cancelRemark" th:text="*{cancelRemark}" class="form-control" readonly></textarea> <textarea name="cancelRemark" th:text="*{cancelRemark}" class="form-control" readonly></textarea>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label" for="ywjlVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
<div class="col-sm-8">
<select name="p_B_ywjlVerifyApproved" id="ywjlVerifyApproved" class="form-control m-b" required>
<option value=""></option>
<option value="true">同意</option>
<option value="false">拒绝</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">批注：</label>
<div class="col-sm-8">
<textarea name="comment" class="form-control"></textarea>
</div>
</div>
<div class="container" style="display: none;"> <div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4> <h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row"> <div class="col-xs-12 form-row">

51
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
View File

@ -19,6 +19,12 @@
<input name="instanceId" th:field="*{instanceId}" type="hidden"> <input name="instanceId" th:field="*{instanceId}" type="hidden">
<input name="instanceType" th:field="*{instanceType}" type="hidden"> <input name="instanceType" th:field="*{instanceType}" type="hidden">
<input type="hidden" name="p_COM_comment" /> <input type="hidden" name="p_COM_comment" />
<div class="form-group">
<label class="col-sm-3 control-label is-required">销售订单编号：</label>
<div class="col-sm-8">
<input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required readonly>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">申请人：</label> <label class="col-sm-3 control-label">申请人：</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -40,18 +46,36 @@
<input name="title" th:field="*{applyTitle}" class="form-control" type="text" disabled> <input name="title" th:field="*{applyTitle}" class="form-control" type="text" disabled>
</div> </div>
</div> </div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label is-required">订单索引号：</label> <div class="form-group">
<label class="col-sm-3 control-label" for="zozjVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="salesOrderID" class="form-control" th:field="*{salesOrderId}" type="number" required > <select name="p_B_zozjVerifyApproved" id="zozjVerifyApproved" class="form-control m-b" required>
<option value=""></option>
<option value="true">同意</option>
<option value="false">拒绝</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">批注：</label>
<div class="col-sm-8">
<textarea name="comment" class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="col-xs-11" style="margin-left: 20px;">
<hr style="border-top: 1px dashed blue;border-bottom: 1px dashed blue;margin-top: 0px;">
<h3 style="margin-top: 0px;">订单信息</h3>
</div>
<div class="form-group" hidden="hidden"> <div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label is-required">销售订单编号：</label> <label class="col-sm-3 control-label is-required">订单索引号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required readonly> <input name="salesOrderID" class="form-control" th:field="*{salesOrderId}" type="number" required >
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">客户ID：</label> <label class="col-sm-3 control-label is-required">客户ID：</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -250,22 +274,7 @@
<textarea name="cancelRemark" th:text="*{cancelRemark}" class="form-control" readonly></textarea> <textarea name="cancelRemark" th:text="*{cancelRemark}" class="form-control" readonly></textarea>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label" for="zozjVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
<div class="col-sm-8">
<select name="p_B_zozjVerifyApproved" id="zozjVerifyApproved" class="form-control m-b" required>
<option value=""></option>
<option value="true">同意</option>
<option value="false">拒绝</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">批注：</label>
<div class="col-sm-8">
<textarea name="comment" class="form-control"></textarea>
</div>
</div>
<div class="container" style="display: none;"> <div class="container" style="display: none;">
<h4 class="form-header h4">计算</h4> <h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row"> <div class="col-xs-12 form-row">

Write Preview
Loading…
Cancel
Save