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

[fix] 客户资料 销售订单 

修改销售订单的添加页面:去掉不需要字段的必填校验
修改销售订单的详情页面:去掉不需要字段的必填校验
修改销售订单的编辑页面:去掉不需要字段的必填校验
修改销售顶单的业务经理审批页面:去掉不需要字段的必填校验
修改销售顶单的业务主管审批页面:去掉不需要字段的必填校验
修改销售顶单的业务驳回调整页面:去掉不需要字段的必填校验
修改销售顶单的业务总经理\总助审批页面:去掉不需要字段的必填校验
修改客户资料的添加页面:去掉不需要字段的必填校验
修改客户资料的编辑页面:去掉不需要字段的必填校验
修改客户资料的详情页面:去掉不需要字段的必填校验
修改客户资料的业务经理审批页面:去掉不需要字段的必填校验
修改客户资料的业务主管审批页面:去掉不需要字段的必填校验
修改客户资料的业务驳回调整页面:去掉不需要字段的必填校验
修改客户资料的业务总经理\总助审批页面:去掉不需要字段的必填校验
dev
liuxiaoxu 4 months ago
parent
6c1194a66c
commit
a25cb9fe40
12 changed files with 77 additions and 77 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. 8
      ruoyi-admin/src/main/resources/templates/system/customer/add.html
  2. 20
      ruoyi-admin/src/main/resources/templates/system/customer/detail.html
  3. 24
      ruoyi-admin/src/main/resources/templates/system/customer/edit.html
  4. 20
      ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html
  5. 22
      ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html
  6. 22
      ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html
  7. 22
      ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html
  8. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
  9. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
  10. 4
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
  11. 4
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
  12. 4
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

8
ruoyi-admin/src/main/resources/templates/system/customer/add.html
View File

@ -91,7 +91,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">开票公司名称：</label>
<label class="col-sm-6 control-label">开票公司名称：</label>
<div class="col-sm-6">
<input name="invoicingCompanyName" class="form-control" type="text">
</div>
@ -179,7 +179,7 @@
</div>
</div>
<div class="form-group" >
<label class="col-sm-6 control-label is-required is-required" >客户第一联系人：</label>
<label class="col-sm-6 control-label" >客户第一联系人：</label>
<div class="col-sm-6">
<input name="customerContact" class="form-control" type="text" />
<!-- <select id="selectContact" name="customerContact" class="form-control" type="text" required></select>-->
@ -192,9 +192,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一联系人电话：</label>
<label class="col-sm-6 control-label">第一联系人电话：</label>
<div class="col-sm-6">
<input name="contactNumber" class="form-control" type="text" required>
<input name="contactNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group">

20
ruoyi-admin/src/main/resources/templates/system/customer/detail.html
View File

@ -83,10 +83,10 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required" >开票公司名称：</label>
<label class="col-sm-6 control-label" >开票公司名称：</label>
<div class="col-sm-6">
<input name="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control"
type="text" disabled required>
type="text" disabled>
</div>
</div>
<div class="form-group">
@ -173,7 +173,7 @@
</div>
</div>
<div class="form-group" >
<label class="col-sm-6 control-label is-required is-required" >客户第一联系人：</label>
<label class="col-sm-6 control-label">客户第一联系人：</label>
<div class="col-sm-6">
<input name="customerContact" class="form-control" type="text" th:field="*{customerContact}" readonly/>
</div>
@ -185,9 +185,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一联系人电话：</label>
<label class="col-sm-6 control-label">第一联系人电话：</label>
<div class="col-sm-6">
<input name="contactNumber" class="form-control" type="text" th:field="*{contactNumber}" disabled required>
<input name="contactNumber" class="form-control" type="text" th:field="*{contactNumber}" disabled>
</div>
</div>
<div class="form-group">
@ -203,19 +203,19 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">客户第一收货人：</label>
<label class="col-sm-6 control-label">客户第一收货人：</label>
<div class="col-sm-6">
<input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" disabled required/>
<input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" disabled/>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人电话：</label>
<label class="col-sm-6 control-label">第一收货人电话：</label>
<div class="col-sm-6">
<input name="deliveryCustomerPhone" class="form-control" type="text" th:field="*{deliveryCustomerPhone}" disabled required>
<input name="deliveryCustomerPhone" class="form-control" type="text" th:field="*{deliveryCustomerPhone}" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人地址：</label>
<label class="col-sm-6 control-label">第一收货人地址：</label>
<div class="col-sm-6">
<input required name="deliveryAddress" class="form-control" type="text" th:field="*{deliveryAddress}" readonly>
</div>

24
ruoyi-admin/src/main/resources/templates/system/customer/edit.html
View File

@ -90,9 +90,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required" >开票公司名称：</label>
<label class="col-sm-6 control-label" >开票公司名称：</label>
<div class="col-sm-6">
<input required name="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control" type="text">
<input name="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -176,9 +176,9 @@
</div>
</div>
<div class="form-group" >
<label class="col-sm-6 control-label is-required is-required" >客户第一联系人：</label>
<label class="col-sm-6 control-label" >客户第一联系人：</label>
<div class="col-sm-6">
<input name="customerContact" th:field="*{customerContact}" class="form-control" type="text" required>
<input name="customerContact" th:field="*{customerContact}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -188,9 +188,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一联系人电话：</label>
<label class="col-sm-6 control-label">第一联系人电话：</label>
<div class="col-sm-6">
<input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" required />
<input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text"/>
</div>
</div>
<div class="form-group">
@ -206,21 +206,21 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">客户第一收货人：</label>
<label class="col-sm-6 control-label">客户第一收货人：</label>
<div class="col-sm-6">
<input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" required/>
<input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人电话：</label>
<label class="col-sm-6 control-label">第一收货人电话：</label>
<div class="col-sm-6">
<input name="客户第一收货人联系电话" th:field="*{deliveryCustomerPhone}" class="form-control" type="text" required>
<input name="客户第一收货人联系电话" th:field="*{deliveryCustomerPhone}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人地址：</label>
<label class="col-sm-6 control-label">第一收货人地址：</label>
<div class="col-sm-6">
<input required name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text">
<input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text">
</div>
</div>
<div class="form-group">

20
ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html
View File

@ -110,7 +110,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required" >开票公司名称：</label>
<label class="col-sm-6 control-label" >开票公司名称：</label>
<div class="col-sm-6">
<input required name="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control" type="text">
</div>
@ -196,9 +196,9 @@
</div>
</div>
<div class="form-group" >
<label class="col-sm-6 control-label is-required is-required" >客户第一联系人：</label>
<label class="col-sm-6 control-label" >客户第一联系人：</label>
<div class="col-sm-6">
<input name="customerContact" th:field="*{customerContact}" class="form-control" type="text" required>
<input name="customerContact" th:field="*{customerContact}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -208,9 +208,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一联系人电话：</label>
<label class="col-sm-6 control-label">第一联系人电话：</label>
<div class="col-sm-6">
<input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" required />
<input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" />
</div>
</div>
<div class="form-group">
@ -226,19 +226,19 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">客户第一收货人：</label>
<label class="col-sm-6 control-label">客户第一收货人：</label>
<div class="col-sm-6">
<input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" required/>
<input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人电话：</label>
<label class="col-sm-6 control-label">第一收货人电话：</label>
<div class="col-sm-6">
<input name="客户第一收货人联系电话" th:field="*{deliveryCustomerPhone}" class="form-control" type="text" required>
<input name="客户第一收货人联系电话" th:field="*{deliveryCustomerPhone}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人地址：</label>
<label class="col-sm-6 control-label">第一收货人地址：</label>
<div class="col-sm-6">
<input required name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text">
</div>

22
ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html
View File

@ -103,10 +103,10 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">开票公司名称：</label>
<label class="col-sm-6 control-label">开票公司名称：</label>
<div class="col-sm-6">
<input name="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control"
type="text" readonly required>
type="text" readonly>
</div>
</div>
<div class="form-group">
@ -199,9 +199,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">客户第一收货人：</label>
<label class="col-sm-6 control-label">客户第一收货人：</label>
<div class="col-sm-6">
<input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" readonly required/>
<input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" readonly/>
</div>
</div>
<div class="form-group">
@ -211,9 +211,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一联系人电话：</label>
<label class="col-sm-6 control-label">第一联系人电话：</label>
<div class="col-sm-6">
<input name="contactNumber" class="form-control" type="text" th:field="*{contactNumber}" required readonly>
<input name="contactNumber" class="form-control" type="text" th:field="*{contactNumber}" readonly>
</div>
</div>
<div class="form-group">
@ -229,24 +229,24 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">客户第一收货人：</label>
<label class="col-sm-6 control-label">客户第一收货人：</label>
<div class="col-sm-6">
<input name="deliveryCustomerPerson" class="form-control"
type="text" th:field="*{deliveryCustomerPerson}" readonly/>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人电话：</label>
<label class="col-sm-6 control-label">第一收货人电话：</label>
<div class="col-sm-6">
<input name="deliveryCustomerPhone" class="form-control"
type="text" th:field="*{deliveryCustomerPhone}" readonly required >
type="text" th:field="*{deliveryCustomerPhone}" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人地址：</label>
<label class="col-sm-6 control-label">第一收货人地址：</label>
<div class="col-sm-6">
<input name="deliveryAddress" class="form-control"
type="text" th:field="*{deliveryAddress}" readonly required>
type="text" th:field="*{deliveryAddress}" readonly>
</div>
</div>
<div class="form-group">

22
ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html
View File

@ -103,10 +103,10 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">开票公司名称：</label>
<label class="col-sm-6 control-label">开票公司名称：</label>
<div class="col-sm-6">
<input name="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control"
type="text" readonly required>
type="text" readonly>
</div>
</div>
<div class="form-group">
@ -199,9 +199,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">客户第一收货人：</label>
<label class="col-sm-6 control-label">客户第一收货人：</label>
<div class="col-sm-6">
<input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" readonly required/>
<input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" readonly/>
</div>
</div>
<div class="form-group">
@ -211,9 +211,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一联系人电话：</label>
<label class="col-sm-6 control-label">第一联系人电话：</label>
<div class="col-sm-6">
<input name="contactNumber" class="form-control" type="text" th:field="*{contactNumber}" required readonly>
<input name="contactNumber" class="form-control" type="text" th:field="*{contactNumber}" readonly>
</div>
</div>
<div class="form-group">
@ -229,24 +229,24 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">客户第一收货人：</label>
<label class="col-sm-6 control-label">客户第一收货人：</label>
<div class="col-sm-6">
<input name="deliveryCustomerPerson" class="form-control"
type="text" th:field="*{deliveryCustomerPerson}" readonly/>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人电话：</label>
<label class="col-sm-6 control-label">第一收货人电话：</label>
<div class="col-sm-6">
<input name="deliveryCustomerPhone" class="form-control"
type="text" th:field="*{deliveryCustomerPhone}" readonly required >
type="text" th:field="*{deliveryCustomerPhone}" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人地址：</label>
<label class="col-sm-6 control-label">第一收货人地址：</label>
<div class="col-sm-6">
<input name="deliveryAddress" class="form-control"
type="text" th:field="*{deliveryAddress}" readonly required>
type="text" th:field="*{deliveryAddress}" readonly>
</div>
</div>
<div class="form-group">

22
ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html
View File

@ -103,10 +103,10 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">开票公司名称：</label>
<label class="col-sm-6 control-label">开票公司名称：</label>
<div class="col-sm-6">
<input name="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control"
type="text" readonly required>
type="text" readonly>
</div>
</div>
<div class="form-group">
@ -199,9 +199,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">客户第一联系人：</label>
<label class="col-sm-6 control-label">客户第一联系人：</label>
<div class="col-sm-6">
<input name="customerContact" class="form-control" type="text" th:field="*{customerContact}" readonly required/> </div>
<input name="customerContact" class="form-control" type="text" th:field="*{customerContact}" readonly/> </div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label">第一联系人职务：</label>
@ -210,9 +210,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一联系人电话：</label>
<label class="col-sm-6 control-label">第一联系人电话：</label>
<div class="col-sm-6">
<input name="contactNumber" class="form-control" type="text" th:field="*{contactNumber}" required readonly>
<input name="contactNumber" class="form-control" type="text" th:field="*{contactNumber}" readonly>
</div>
</div>
<div class="form-group">
@ -228,24 +228,24 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">客户第一收货人：</label>
<label class="col-sm-6 control-label">客户第一收货人：</label>
<div class="col-sm-6">
<input name="deliveryCustomerPerson" class="form-control"
type="text" th:field="*{deliveryCustomerPerson}" readonly/>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人电话：</label>
<label class="col-sm-6 control-label">第一收货人电话：</label>
<div class="col-sm-6">
<input name="deliveryCustomerPhone" class="form-control"
type="text" th:field="*{deliveryCustomerPhone}" readonly required >
type="text" th:field="*{deliveryCustomerPhone}" readonly >
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人地址：</label>
<label class="col-sm-6 control-label">第一收货人地址：</label>
<div class="col-sm-6">
<input name="deliveryAddress" class="form-control"
type="text" th:field="*{deliveryAddress}" readonly required>
type="text" th:field="*{deliveryAddress}" readonly>
</div>
</div>
<div class="form-group">

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

@ -101,7 +101,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">客户联系人：</label>
<div class="col-sm-8">
<select id="customerContact_add" name="customerContact" class="form-control m-b" required>
<select id="customerContact_add" name="customerContact" class="form-control m-b">
</select>
</div>
</div>

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

@ -125,7 +125,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">联系人邮箱：</label>
<div class="col-sm-8">
<input name="contactEmail" th:field="*{contactEmail}" class="form-control" type="text" required readonly>
<input name="contactEmail" th:field="*{contactEmail}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">

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

@ -71,9 +71,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">客户联系人：</label>
<label class="col-sm-3 control-label">客户联系人：</label>
<div class="col-sm-8">
<input id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" readonly required/>
<input id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" readonly/>
</div>
</div>
<div class="form-group">

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

@ -71,9 +71,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">客户联系人：</label>
<label class="col-sm-3 control-label">客户联系人：</label>
<div class="col-sm-8">
<input id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" readonly required/>
<input id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" readonly/>
</div>
</div>
<div class="form-group">

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

@ -71,9 +71,9 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">客户联系人：</label>
<label class="col-sm-3 control-label">客户联系人：</label>
<div class="col-sm-8">
<input id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" readonly required/>
<input id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" readonly/>
</div>
</div>
<div class="form-group">

Write Preview
Loading…
Cancel
Save