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

[fix] 销售管理 

修复销售订单新增页面：下拉客户名称后查询不到客户联系人的问题；修改前后端查询接口
按照万材调整：去掉销售订单主表的计划交付时间改为使用销售订单详情表维护计划交付时间；调整销售订单新增页面、修改页面、详情页面、驳回调整页面、业务经理审核页面、业务主管审核页面、总经理总助审核页面
dev
liuxiaoxu 5 days ago
parent
e1d19b270e
commit
923403eafb
7 changed files with 64 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
  2. 18
      ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
  3. 18
      ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
  4. 18
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
  5. 18
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
  6. 18
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
  7. 18
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

20
ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
View File

@ -234,15 +234,15 @@
<input name="deliveryConditions" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">计划交付时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">计划交付时间：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <div class="input-group date">-->
<!-- <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text">-->
<!-- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">客户验收时间：</label>
<div class="col-sm-8">
@ -799,7 +799,7 @@
allowClear: true,
ajax:{
type: "post",
url:ctx + "system/customer/contactsList2",
url:ctx + "system/customer/contactsList",
dataType:"json",
delay:250,
cache:true,

18
ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
View File

@ -242,15 +242,15 @@
<input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">计划交付时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:value="*{deliveryTime}" disabled/>
<span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">计划交付时间：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <div class="input-group date">-->
<!-- <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:value="*{deliveryTime}" disabled/>-->
<!-- <span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">客户验收时间：</label>
<div class="col-sm-8">

18
ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
View File

@ -245,15 +245,15 @@
<input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">计划交付时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="deliveryTime" th:field="*{deliveryTime}" class="form-control" placeholder="yyyy-mm-dd" type="text" />
<span class="input-group-addon" ><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">计划交付时间：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <div class="input-group date">-->
<!-- <input name="deliveryTime" th:field="*{deliveryTime}" class="form-control" placeholder="yyyy-mm-dd" type="text" />-->
<!-- <span class="input-group-addon" ><i class="fa fa-calendar"></i></span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">客户验收时间：</label>
<div class="col-sm-8">

18
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
View File

@ -211,15 +211,15 @@
<input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">计划交付时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" />
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">计划交付时间：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <div class="input-group date">-->
<!-- <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" />-->
<!-- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">客户验收时间：</label>
<div class="col-sm-8">

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

@ -207,15 +207,15 @@
<input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">计划交付时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" readonly/>
<span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">计划交付时间：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <div class="input-group date">-->
<!-- <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" readonly/>-->
<!-- <span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">客户验收时间：</label>
<div class="col-sm-8">

18
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
View File

@ -206,15 +206,15 @@
<input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">计划交付时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" readonly/>
<span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">计划交付时间：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <div class="input-group date">-->
<!-- <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" readonly/>-->
<!-- <span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">客户验收时间：</label>
<div class="col-sm-8">

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

@ -206,15 +206,15 @@
<input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">计划交付时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" readonly/>
<span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">计划交付时间：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <div class="input-group date">-->
<!-- <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" readonly/>-->
<!-- <span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">客户验收时间：</label>
<div class="col-sm-8">

Write Preview
Loading…
Cancel
Save