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

[fix] 

品质管理 品质单
修改来料品质列表页面搜索栏字段；
修改品质报告列表页面，隐藏审核状态；
修改来料开始品质页面提交函数；
dev
王晓迪 3 days ago
parent
b426b13a8d
commit
a7e3157fcc
4 changed files with 12 additions and 9 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. 12
      ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html
  2. 2
      ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeOtherStartingQuality.html
  3. 6
      ruoyi-admin/src/main/resources/templates/quality/qualityOrder/startingQuality.html
  4. 1
      ruoyi-admin/src/main/resources/templates/quality/qualityReport/qualityReport.html

12
ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html
View File

@ -18,13 +18,17 @@
<label>品质单号：</label> <label>品质单号：</label>
<input type="text" name="qualityOrderCode"/> <input type="text" name="qualityOrderCode"/>
</li> </li>
<li>
<label>入库单号：</label>
<input type="text" name="inStorageCode"/>
</li>
<li> <li>
<label>料号：</label> <label>料号：</label>
<input type="text" name="materialNo"/> <input type="text" name="materialNo"/>
</li> </li>
<li> <li>
<label>入库单号：</label> <label>物料名称：</label>
<input type="text" name="inStorageCode"/> <input type="text" name="materialName"/>
</li> </li>
<li> <li>
<label>品质单订单类型：</label> <label>品质单订单类型：</label>
@ -33,10 +37,6 @@
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li>
<label>物料名称：</label>
<input type="text" name="materialName"/>
</li>
<li> <li>
<label>品质单入库类型：</label> <label>品质单入库类型：</label>
<select name="qualityStorageStatus" th:with="type=${@dict.getType('quality_storage_status')}"> <select name="qualityStorageStatus" th:with="type=${@dict.getType('quality_storage_status')}">

2
ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeOtherStartingQuality.html
View File

@ -503,7 +503,7 @@
qualityReport.qualityOrderReportType = "1";//生产其他品质 qualityReport.qualityOrderReportType = "1";//生产其他品质
qualityReport.unqualifiedDataList = unqualifyList; qualityReport.unqualifiedDataList = unqualifyList;
// console.log(qualityReport); // console.log(qualityReport);
$.operate.saveJson(reportPrefix + "/ad", JSON.stringify(qualityReport)); $.operate.saveJson(reportPrefix + "/add", JSON.stringify(qualityReport));
} }
</script> </script>

6
ruoyi-admin/src/main/resources/templates/quality/qualityOrder/startingQuality.html
View File

@ -3,6 +3,7 @@
<head> <head>
<th:block th:include="include :: header('开始品质')" /> <th:block th:include="include :: header('开始品质')" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css" />
<th:block th:include="include :: bootstrap-editable-css" />
<style> <style>
.supplier-value { .supplier-value {
display: flex; display: flex;
@ -62,7 +63,7 @@
<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">
<div class="input-group date"> <div class="input-group date">
<input readonly name="deliveryInspectionTime" th:value="${#dates.format(qualityOrderDetail.deliveryInspectionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"> <input disabled readonly name="deliveryInspectionTime" th:value="${#dates.format(qualityOrderDetail.deliveryInspectionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
</div> </div>
@ -546,7 +547,8 @@
qualityReport.qualityOrderReportType = "1";//生产其他品质 qualityReport.qualityOrderReportType = "1";//生产其他品质
qualityReport.unqualifiedDataList = unqualifyList; qualityReport.unqualifiedDataList = unqualifyList;
console.log(qualityReport); console.log(qualityReport);
$.operate.saveJson(reportPrefix + "/add", JSON.stringify(qualityReport)); // $.operate.saveJson(reportPrefix + "/add", JSON.stringify(qualityReport));
return;
} }
</script> </script>
</body> </body>

1
ruoyi-admin/src/main/resources/templates/quality/qualityReport/qualityReport.html
View File

@ -170,6 +170,7 @@
title: '审批状态', title: '审批状态',
align: 'center', align: 'center',
field: 'auditStatus', field: 'auditStatus',
visible: false,
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(auditStatusDatas, value); return $.table.selectDictLabel(auditStatusDatas, value);
} }

Write Preview
Loading…
Cancel
Save