Browse Source

[feat]修改字段:将物料字段中 物料加工 改为 半成品类型 , 添加一个查询技术团队的service层方法,名称为:selectSysProductItemLists()

dev
zhangsiqi 6 months ago
parent
commit
270804031b
  1. 4
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysTechnicalTeamServiceImpl.java
  2. 2
      ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/materialSelect.html
  3. 4
      ruoyi-admin/src/main/resources/templates/erp/bom/add.html
  4. 8
      ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
  5. 4
      ruoyi-admin/src/main/resources/templates/erp/bom/detail.html
  6. 4
      ruoyi-admin/src/main/resources/templates/erp/bom/edit.html
  7. 2
      ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html
  8. 2
      ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html
  9. 2
      ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html
  10. 2
      ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
  11. 2
      ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/edit.html
  12. 2
      ruoyi-admin/src/main/resources/templates/erp/inboundOrder/equipmentResumeDetail.html
  13. 4
      ruoyi-admin/src/main/resources/templates/erp/inboundOrder/processInboundDetail.html
  14. 4
      ruoyi-admin/src/main/resources/templates/erp/inboundOrder/produceInboundDetail.html
  15. 2
      ruoyi-admin/src/main/resources/templates/erp/material/add.html
  16. 2
      ruoyi-admin/src/main/resources/templates/erp/material/detail.html
  17. 2
      ruoyi-admin/src/main/resources/templates/erp/material/edit.html
  18. 4
      ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
  19. 4
      ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
  20. 6
      ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html
  21. 2
      ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/add.html
  22. 2
      ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/edit.html
  23. 2
      ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/add.html
  24. 2
      ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/edit.html
  25. 4
      ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/materialReturnInspectionDetail.html
  26. 2
      ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html
  27. 2
      ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html
  28. 2
      ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html
  29. 2
      ruoyi-admin/src/main/resources/templates/quality/complaintNotice/returnInspectionProcessing.html
  30. 2
      ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/materialSelect.html
  31. 2
      ruoyi-admin/src/main/resources/templates/quality/returnInspection/detail.html
  32. 2
      ruoyi-admin/src/main/resources/templates/quality/returnInspection/edit.html
  33. 2
      ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspectionProcessing.html
  34. 7
      ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
  35. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
  36. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
  37. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
  38. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwgzVerify.html
  39. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
  40. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
  41. 2
      ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
  42. 2
      ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
  43. 2
      ruoyi-admin/src/main/resources/templates/system/makeorder/addEquipmentResume.html
  44. 4
      ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html
  45. 4
      ruoyi-admin/src/main/resources/templates/system/makeorder/addProduceInbound.html
  46. 4
      ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html
  47. 4
      ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html
  48. 4
      ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html
  49. 4
      ruoyi-admin/src/main/resources/templates/system/makeorder/gcsh.html
  50. 2
      ruoyi-admin/src/main/resources/templates/system/makeorder/selectMakeorderDetail.html
  51. 4
      ruoyi-admin/src/main/resources/templates/system/makeorderpick/detail.html
  52. 4
      ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskModifyApply.html
  53. 4
      ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskScjlVerify.html
  54. 4
      ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskSczgVerify.html
  55. 1
      ruoyi-admin/src/main/resources/templates/system/requesitioningChild/add.html
  56. 5
      ruoyi-admin/src/main/resources/templates/system/requisitioning/add.html
  57. 33
      ruoyi-admin/src/main/resources/templates/system/requisitioning/edit.html
  58. 8
      ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
  59. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
  60. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
  61. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
  62. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
  63. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
  64. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

4
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysTechnicalTeamServiceImpl.java

@ -136,6 +136,10 @@ public class SysTechnicalTeamServiceImpl implements ISysTechnicalTeamService
return sysTechnicalTeamMapper.selectSysTechnicalTeamList(sysTechnicalTeam); return sysTechnicalTeamMapper.selectSysTechnicalTeamList(sysTechnicalTeam);
} }
public List<SysTechnicalTeam> selectSysProductItemLists() {
SysTechnicalTeam sysTechnicalTeam = new SysTechnicalTeam();
return sysTechnicalTeamMapper.selectSysTechnicalTeamList(sysTechnicalTeam);
}
@Override @Override
public Object getId() { public Object getId() {
return redisCache.generateNo("JSTEAM"); return redisCache.generateNo("JSTEAM");

2
ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/materialSelect.html

@ -56,7 +56,7 @@
field: 'materialUnit', field: 'materialUnit',
}, },
{ {
title: '加工方式', title: '半成品类型',
field: 'materialProcessMethod', field: 'materialProcessMethod',
}, },

4
ruoyi-admin/src/main/resources/templates/erp/bom/add.html

@ -42,7 +42,7 @@
<input type="text" id="materialType" name="materialType" readonly hidden /> <input type="text" id="materialType" name="materialType" readonly hidden />
</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">
<select disabled id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required> <select disabled id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required>
<option value="" ></option> <option value="" ></option>
@ -307,7 +307,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

8
ruoyi-admin/src/main/resources/templates/erp/bom/bom.html

@ -232,7 +232,7 @@
}, },
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -438,7 +438,7 @@
}, },
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -580,7 +580,7 @@
}, },
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -738,7 +738,7 @@
}, },
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

4
ruoyi-admin/src/main/resources/templates/erp/bom/detail.html

@ -34,7 +34,7 @@
</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">
<select disabled id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}"> <select disabled id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}">
<option value=""></option> <option value=""></option>
@ -241,7 +241,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

4
ruoyi-admin/src/main/resources/templates/erp/bom/edit.html

@ -35,7 +35,7 @@
</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">
<select disabled id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}"> <select disabled id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}">
<option value=""></option> <option value=""></option>
@ -260,7 +260,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html

@ -62,7 +62,7 @@
<input type="text" id="materialType" name="materialType" th:field="*{materialType}" readonly hidden /> <input type="text" id="materialType" name="materialType" th:field="*{materialType}" readonly hidden />
</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">
<select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled> <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>

2
ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html

@ -103,7 +103,7 @@
</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="materialProcessMode" class="form-control" type="text"> <input name="materialProcessMode" class="form-control" type="text">
</div> </div>

2
ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html

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

2
ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html

@ -181,7 +181,7 @@
field: 'materialDescribe', field: 'materialDescribe',
}, },
{ {
title: '加工方式', title: '半成品类型',
field: 'materialProcessMode', field: 'materialProcessMode',
}, },

2
ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/edit.html

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

2
ruoyi-admin/src/main/resources/templates/erp/inboundOrder/equipmentResumeDetail.html

@ -62,7 +62,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">加工方式</label> <label class="col-sm-4 control-label">半成品类型</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select disabled name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required> <select disabled name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required>
<option value=""></option> <option value=""></option>

4
ruoyi-admin/src/main/resources/templates/erp/inboundOrder/processInboundDetail.html

@ -128,7 +128,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -260,7 +260,7 @@
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

4
ruoyi-admin/src/main/resources/templates/erp/inboundOrder/produceInboundDetail.html

@ -127,7 +127,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -277,7 +277,7 @@
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/erp/material/add.html

@ -35,7 +35,7 @@
<input type="text" id="materialType" name="materialType" hidden /> <input type="text" id="materialType" name="materialType" hidden />
</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">
<select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required> <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required>
<option value=""></option> <option value=""></option>

2
ruoyi-admin/src/main/resources/templates/erp/material/detail.html

@ -36,7 +36,7 @@
<input type="text" readonly id="materialType" name="materialType" th:field="*{materialType}" hidden /> <input type="text" readonly id="materialType" name="materialType" th:field="*{materialType}" hidden />
</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">
<select readonly name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}"> <select readonly name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>

2
ruoyi-admin/src/main/resources/templates/erp/material/edit.html

@ -36,7 +36,7 @@
<input type="text" id="materialType" name="materialType" th:field="*{materialType}" hidden /> <input type="text" id="materialType" name="materialType" th:field="*{materialType}" hidden />
</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">
<select name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required> <select name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required>
<option value=""></option> <option value=""></option>

4
ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html

@ -60,7 +60,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<select name="productItem" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" disabled> <select name="productItem" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" disabled>
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="product:${productList}" th:value="${product.id}" th:text="${product.id}"></option> <option th:each="product:${productList}" th:value="${product.technicalTeamId}" th:text="${product.technicalTeamId}"></option>
</select> </select>
</div> </div>
</div> </div>
@ -69,7 +69,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<select name="itemName" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" disabled> <select name="itemName" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" disabled>
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="product:${productList}" th:value="${product.productItem}" th:text="${product.productItem}"></option> <option th:each="product:${productList}" th:value="${product.technicalTeamName}" th:text="${product.technicalTeamName}"></option>
</select> </select>
</div> </div>
</div> </div>

4
ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html

@ -61,7 +61,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<select name="productItem" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" > <select name="productItem" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" >
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="product:${productList}" th:value="${product.id}" th:text="${product.id}"></option> <option th:each="product:${productList}" th:value="${product.technicalTeamId}" th:text="${product.technicalTeamIdid}"></option>
</select> </select>
</div> </div>
</div> </div>
@ -70,7 +70,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<select name="itemName" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" > <select name="itemName" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" >
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="product:${productList}" th:value="${product.productItem}" th:text="${product.productItem}"></option> <option th:each="product:${productList}" th:value="${product.technicalTeamName}" th:text="${product.technicalTeamName}"></option>
</select> </select>
</div> </div>
</div> </div>

6
ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html

@ -60,7 +60,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<select name="productItem" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" disabled> <select name="productItem" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" disabled>
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="product:${productList}" th:value="${product.id}" th:text="${product.id}"></option> <option th:each="product:${productList}" th:value="${product.technicalTeamId}" th:text="${product.technicalTeamId}"></option>
</select> </select>
</div> </div>
</div> </div>
@ -69,7 +69,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<select name="itemName" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" disabled> <select name="itemName" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" disabled>
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="product:${productList}" th:value="${product.productItem}" th:text="${product.productItem}"></option> <option th:each="product:${productList}" th:value="${product.technicalTeamName}" th:text="${product.technicalTeamName}"></option>
</select> </select>
</div> </div>
</div> </div>
@ -88,7 +88,7 @@
<input type="text" id="materialType" name="materialType" th:field="*{materialType}" readonly hidden /> <input type="text" id="materialType" name="materialType" th:field="*{materialType}" readonly hidden />
</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">
<select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled> <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>

2
ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/add.html

@ -172,7 +172,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var curIndex = index; var curIndex = index;
var columnInput = $.common.sprintf("<input type='hidden' name='inspectionDetails[%s].processMethod' value='%s'>", curIndex, value); var columnInput = $.common.sprintf("<input type='hidden' name='inspectionDetails[%s].processMethod' value='%s'>", curIndex, value);

2
ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/edit.html

@ -192,7 +192,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var curIndex = index; var curIndex = index;
var columnInput = $.common.sprintf("<input type='hidden' name='inspectionDetails[%s].processMethod' value='%s'>", curIndex, value); var columnInput = $.common.sprintf("<input type='hidden' name='inspectionDetails[%s].processMethod' value='%s'>", curIndex, value);

2
ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/add.html

@ -47,7 +47,7 @@
</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="processMethod" class="form-control" type="text"> <input name="processMethod" class="form-control" type="text">
</div> </div>

2
ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/edit.html

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

4
ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/materialReturnInspectionDetail.html

@ -30,7 +30,7 @@
</select> </select>
</li> </li>
<li> <li>
<label>加工方式</label> <label>半成品类型</label>
<input type="text" name="processMethod"/> <input type="text" name="processMethod"/>
</li> </li>
<li> <li>
@ -155,7 +155,7 @@
field: 'materialType', field: 'materialType',
}, },
{ {
title: '加工方式', title: '半成品类型',
field: 'processMethod', field: 'processMethod',
}, },
{ {

2
ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html

@ -147,7 +147,7 @@
}, },
{field: 'describe',title: '描述',}, {field: 'describe',title: '描述',},
{field: 'brand',title: '品牌',}, {field: 'brand',title: '品牌',},
{field: 'processMethod',title: '加工方式', {field: 'processMethod',title: '半成品类型',
formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);} formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}
}, },
{field: 'unit',title: '单位', {field: 'unit',title: '单位',

2
ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html

@ -202,7 +202,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html

@ -196,7 +196,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/quality/complaintNotice/returnInspectionProcessing.html

@ -291,7 +291,7 @@
field: 'materialDescribe', field: 'materialDescribe',
}, },
{ {
title: '加工方式', title: '半成品类型',
field: 'materialProcessMethod', field: 'materialProcessMethod',
}, },
{ {

2
ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/materialSelect.html

@ -61,7 +61,7 @@
field: 'materialUnit', field: 'materialUnit',
}, },
{ {
title: '加工方式', title: '半成品类型',
field: 'materialProcessMethod', field: 'materialProcessMethod',
}, },
{ {

2
ruoyi-admin/src/main/resources/templates/quality/returnInspection/detail.html

@ -162,7 +162,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/quality/returnInspection/edit.html

@ -192,7 +192,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var curIndex = index; var curIndex = index;
var columnInput = $.common.sprintf("<input type='hidden' name='inspectionDetails[%s].processMethod' value='%s'>", curIndex, value); var columnInput = $.common.sprintf("<input type='hidden' name='inspectionDetails[%s].processMethod' value='%s'>", curIndex, value);

2
ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspectionProcessing.html

@ -192,7 +192,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var curIndex = index; var curIndex = index;
var columnInput = $.common.sprintf("<input type='hidden' name='inspectionDetails[%s].processMethod' value='%s'>", curIndex, value); var columnInput = $.common.sprintf("<input type='hidden' name='inspectionDetails[%s].processMethod' value='%s'>", curIndex, value);

7
ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html

@ -65,7 +65,10 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">国内税率:</label> <label class="col-sm-4 control-label">国内税率:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="rmbTax" id="rmbTax_add" class="form-control" type="number" placeholder="13" tloop="%"/> <div class="input-group">
<input name="rmbTax" id="rmbTax_add" class="form-control" type="number" placeholder="13" />
<span class="input-group-addon">%</span>
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -239,7 +242,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html

@ -209,7 +209,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html

@ -227,7 +227,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html

@ -263,7 +263,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwgzVerify.html

@ -266,7 +266,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html

@ -263,7 +263,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html

@ -262,7 +262,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html

@ -90,7 +90,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html

@ -99,7 +99,7 @@
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.requisiteId + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.requisiteId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.requisiteId + '\')"><i class="fa fa-remove"></i>详情</a> '); actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.requisiteId + '\')"><i class="fa fa-deatil"></i>详情</a> ');
if(row.delFlag == '0'){ if(row.delFlag == '0'){
actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> '); actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
}else{ }else{

2
ruoyi-admin/src/main/resources/templates/system/makeorder/addEquipmentResume.html

@ -62,7 +62,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">加工方式</label> <label class="col-sm-4 control-label is-required">半成品类型</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select disabled name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required> <select disabled name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required>
<option value=""></option> <option value=""></option>

4
ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html

@ -138,7 +138,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -270,7 +270,7 @@
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

4
ruoyi-admin/src/main/resources/templates/system/makeorder/addProduceInbound.html

@ -142,7 +142,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -300,7 +300,7 @@
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

4
ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html

@ -137,7 +137,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -268,7 +268,7 @@
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

4
ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html

@ -134,7 +134,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -266,7 +266,7 @@
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

4
ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html

@ -138,7 +138,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -270,7 +270,7 @@
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

4
ruoyi-admin/src/main/resources/templates/system/makeorder/gcsh.html

@ -138,7 +138,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -270,7 +270,7 @@
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/system/makeorder/selectMakeorderDetail.html

@ -112,7 +112,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

4
ruoyi-admin/src/main/resources/templates/system/makeorderpick/detail.html

@ -130,7 +130,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -259,7 +259,7 @@
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

4
ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskModifyApply.html

@ -165,7 +165,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -295,7 +295,7 @@
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

4
ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskScjlVerify.html

@ -170,7 +170,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -299,7 +299,7 @@
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

4
ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskSczgVerify.html

@ -170,7 +170,7 @@
{ {
field: 'processMethod', field: 'processMethod',
align: 'center', align: 'center',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -299,7 +299,7 @@
{ {
field: 'processMethod', field: 'processMethod',
title: '加工方式', title: '半成品类型',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

1
ruoyi-admin/src/main/resources/templates/system/requesitioningChild/add.html

@ -42,7 +42,6 @@
<select name="materialType" class="form-control m-b"> <select name="materialType" class="form-control m-b">
<option value="">所有</option> <option value="">所有</option>
</select> </select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

5
ruoyi-admin/src/main/resources/templates/system/requisitioning/add.html

@ -97,7 +97,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -216,7 +216,7 @@
} }
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
var formData = $("#form-requisitionChild-add").serializeArray(); var formData = $("#form-requisitioning-add").serializeArray();
console.log("formData",formData); console.log("formData",formData);
var tableData = $("#bootstrap-sub-table-requisitionChild").bootstrapTable('getData'); var tableData = $("#bootstrap-sub-table-requisitionChild").bootstrapTable('getData');
let rows = tableData.length; let rows = tableData.length;
@ -235,7 +235,6 @@
type: "get", type: "get",
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {
console.log(data);
$("select[name='deptName']").append($('<option></option>').val(data.deptName).html(data.deptName)); $("select[name='deptName']").append($('<option></option>').val(data.deptName).html(data.deptName));
$("select[name='userName']").append($('<option></option>').val(data.userName).html(data.userName)); $("select[name='userName']").append($('<option></option>').val(data.userName).html(data.userName));
$("select[name='postName']").append($('<option></option>').val(data.postName).html(data.postName)); $("select[name='postName']").append($('<option></option>').val(data.postName).html(data.postName));

33
ruoyi-admin/src/main/resources/templates/system/requisitioning/edit.html

@ -18,19 +18,19 @@
<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">
<select name="dept" class="form-control"></select> <select name="deptName" class="form-control"></select>
</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">
<select name="post" class="form-control"></select> <select name="postName" class="form-control"></select>
</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">
<select name="username" class="form-control"></select> <select name="userName" class="form-control"></select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -68,6 +68,7 @@
var prefix = ctx + "system/requisitioning"; var prefix = ctx + "system/requisitioning";
$("#form-requisitioning-edit").validate({focusCleanup: true}); $("#form-requisitioning-edit").validate({focusCleanup: true});
$(function() { $(function() {
getSelections();
var options = { var options = {
id:'bootstrap-sub-table-requisitionChild', id:'bootstrap-sub-table-requisitionChild',
url: ctx + "system/requesitioningChild/list", url: ctx + "system/requesitioningChild/list",
@ -108,7 +109,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -183,9 +184,31 @@
} }
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-requisitioning-edit').serialize()); var formData = $("#form-requisitioning-edit").serializeArray();
console.log("formData",formData);
var tableData = $("#bootstrap-sub-table-requisitionChild").bootstrapTable('getData');
let rows = tableData.length;
if(rows==0){
$.modal.msgError("子表数据不能为空!");
}else{
formData.push({"name": "baseRequisitioningOrderChildList", "value": tableData});
var jsonData = $.common.formDataToJson(formData);
$.operate.saveJson(prefix + "/edit", jsonData);
}
} }
} }
function getSelections(){
$.ajax({
url: ctx + "system/requisitioning/getEmpUserName",
type: "get",
dataType: "json",
success: function (data) {
$("select[name='deptName']").append($('<option></option>').val(data.deptName).html(data.deptName));
$("select[name='userName']").append($('<option></option>').val(data.userName).html(data.userName));
$("select[name='postName']").append($('<option></option>').val(data.postName).html(data.postName));
}
});
}
</script> </script>
</body> </body>
</html> </html>

8
ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html

@ -194,7 +194,11 @@
<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="taxRate" id="taxRate_add" class="form-control" type="number" required> <div class="input-group">
<input name="taxRate" id="taxRate_add" class="form-control" type="number" required>
<span class="input-group-addon">%</span>
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -348,7 +352,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html

@ -366,7 +366,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

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

@ -362,7 +362,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html

@ -374,7 +374,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html

@ -361,7 +361,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html

@ -378,7 +378,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

2
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

@ -361,7 +361,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '加工方式',field: 'processMethod',align: 'center', {title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }

Loading…
Cancel
Save