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

[feat]销售管理:销售订单的时候，客户联系人、收货人等信息改为选填项

dev
zhangsiqi 6 months ago
parent
7b1029e837
commit
166f1eb980
7 changed files with 39 additions and 39 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. 6
      ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
  2. 12
      ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
  3. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
  4. 14
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
  5. 20
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
  6. 16
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
  7. 8
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

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

@ -118,20 +118,20 @@
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<select name="customerDelivery" id="customerDelivery_add" class="form-control m-b" required> <select name="customerDelivery" id="customerDelivery_add" class="form-control m-b" required>
</select> </select>
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input name="deliveryPhone" class="form-control" type="text" required> <input name="deliveryPhone" class="form-control" type="text" required>
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input name="deliveryAddress" class="form-control" type="text" required> <input name="deliveryAddress" class="form-control" type="text" required>
</div> </div>

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

@ -91,7 +91,7 @@
<div class="form-group"> <div class="form-group">
<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="enterpriseName" class="form-control" type="text" th:field="*{enterpriseName}" readonly disabled> <input name="enterpriseName" class="form-control" type="text" th:field="*{enterpriseName}" required disabled>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -101,9 +101,9 @@
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<select id="customerContact_edit" name="customerContact" th:field="*{customerContact}" class="form-control m-b" required disabled> <select id="customerContact_edit" name="customerContact" th:field="*{customerContact}" class="form-control m-b" disabled>
</select> </select>
</div> </div>
</div> </div>
@ -126,7 +126,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<select name="customerDelivery" id="customerDelivery_edit" <select name="customerDelivery" id="customerDelivery_edit"
th:field="*{customerDelivery}" class="form-control m-b" disabled> th:field="*{customerDelivery}" class="form-control m-b" disabled>
@ -134,13 +134,13 @@
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input name="deliveryPhone" th:field="*{deliveryPhone}" class="form-control" type="text" disabled /> <input name="deliveryPhone" th:field="*{deliveryPhone}" class="form-control" type="text" disabled />
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" required disabled> <input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" required disabled>
</div> </div>

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

@ -92,7 +92,7 @@
<div class="form-group"> <div class="form-group">
<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="enterpriseName" class="form-control" type="text" th:field="*{enterpriseName}" readonly> <input name="enterpriseName" class="form-control" type="text" th:field="*{enterpriseName}" required readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

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

@ -72,9 +72,9 @@
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" required /> <input id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" />
</div> </div>
</div> </div>
@ -97,9 +97,9 @@
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<select name="customerDelivery" th:field="*{customerDelivery}" class="form-control m-b" required> <select name="customerDelivery" th:field="*{customerDelivery}" class="form-control m-b" >
</select> </select>
</div> </div>
</div> </div>
@ -110,15 +110,15 @@
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input readonly name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" required> <input readonly name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text">
</div> </div>
</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">
<input name="salesOrderNumber" th:field="*{salesOrderNumber}" class="form-control" type="text" required> <input name="salesOrderNumber" th:field="*{salesOrderNumber}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

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

@ -61,7 +61,7 @@
<div class="form-group"> <div class="form-group">
<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 required name="enterpriseName" class="form-control" type="text" th:field="*{enterpriseName}" readonly> <input required name="enterpriseName" class="form-control" type="text" th:field="*{enterpriseName}" required readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -73,7 +73,7 @@
<div class="form-group"> <div class="form-group">
<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 id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" required /> <input id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" readonly/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -85,31 +85,31 @@
<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">
<input readonly name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" > <input readonly name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" readonly>
</div> </div>
</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">
<input readonly name="contactEmail" th:field="*{contactEmail}" class="form-control" type="text" required> <input readonly name="contactEmail" th:field="*{contactEmail}" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input name="customerDelivery" th:field="*{customerDelivery}" class="form-control m-b" required> <input name="customerDelivery" th:field="*{customerDelivery}" class="form-control m-b" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input readonly name="deliveryPhone" th:field="*{deliveryPhone}" class="form-control" type="text" required> <input readonly name="deliveryPhone" th:field="*{deliveryPhone}" class="form-control" type="text" disabled>
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input readonly name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" required> <input readonly name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" disabled>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

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

@ -50,14 +50,14 @@
<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">
<input id="enterpriseCode_edit" name="enterpriseCode" <input id="enterpriseCode_edit" name="enterpriseCode"
class="form-control m-b" required disabled th:field="*{enterpriseCode}"/> class="form-control m-b" th:field="*{enterpriseCode}" required disabled />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<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="enterpriseName" class="form-control" type="text" <input name="enterpriseName" class="form-control" type="text"
th:field="*{enterpriseName}" required disabled> th:field="*{enterpriseName}" required disabled />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -68,10 +68,10 @@
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input id="customerContact_edit" name="customerContact" <input id="customerContact_edit" name="customerContact"
th:field="*{customerContact}" class="form-control m-b" required disabled /> th:field="*{customerContact}" class="form-control m-b" disabled />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -96,24 +96,24 @@
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input name="customerDelivery" id="customerDelivery_edit" <input name="customerDelivery" id="customerDelivery_edit"
th:field="*{customerDelivery}" class="form-control m-b" disabled /> th:field="*{customerDelivery}" class="form-control m-b" disabled />
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input name="deliveryPhone" th:field="*{deliveryPhone}" <input name="deliveryPhone" th:field="*{deliveryPhone}"
class="form-control" type="text" disabled> class="form-control" type="text" disabled>
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input name="deliveryAddress" th:field="*{deliveryAddress}" <input name="deliveryAddress" th:field="*{deliveryAddress}"
class="form-control" type="text" required disabled> class="form-control" type="text" disabled>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

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

@ -57,7 +57,7 @@
<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="enterpriseName" class="form-control" type="text" <input name="enterpriseName" class="form-control" type="text"
th:field="*{enterpriseName}" readonly disabled> th:field="*{enterpriseName}" required disabled>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -93,19 +93,19 @@
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input name="customerDelivery" id="customerDelivery_edit" th:field="*{customerDelivery}" class="form-control m-b" disabled /> <input name="customerDelivery" id="customerDelivery_edit" th:field="*{customerDelivery}" class="form-control m-b" disabled />
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input name="deliveryPhone" th:field="*{deliveryPhone}" class="form-control" type="text" disabled> <input name="deliveryPhone" th:field="*{deliveryPhone}" class="form-control" type="text" disabled>
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-sm-8">
<input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" required disabled> <input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" required disabled>
</div> </div>

Write Preview
Loading…
Cancel
Save