Browse Source

[fix] 工程管理

修改物料的列表、新增、修改、详情、工程经理审核、工程主管审核前端页面:半成品类型->加工方式
dev
liuxiaoxu 2 weeks ago
parent
commit
4f1d93d7cb
  1. 2
      ruoyi-admin/src/main/resources/templates/erp/material/add.html
  2. 2
      ruoyi-admin/src/main/resources/templates/erp/material/detail.html
  3. 2
      ruoyi-admin/src/main/resources/templates/erp/material/edit.html
  4. 4
      ruoyi-admin/src/main/resources/templates/erp/material/material.html
  5. 2
      ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html
  6. 2
      ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
  7. 2
      ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html

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

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

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

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

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

@ -123,8 +123,6 @@
cancelUrl: prefix + "/cancel/{id}",
restoreUrl: prefix + "/restore/{id}",
detailUrl: prefix + "/detail/{id}",
pageList: [10, 25, 50],
pageSize: 10,
showColumns: true,
sortable: true, // 是否启用排序
sortStable: true,
@ -149,7 +147,7 @@
{title: '物料名称',field: 'materialName',},
{title: '描述',field: 'describe',},
{title: '品牌',field: 'brand',},
{title: '半成品类型',field: 'processMethod',
{title: '加工方式',field: 'processMethod',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}

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

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

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

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

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

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

Loading…
Cancel
Save