diff --git a/src/views/modules/yieldReport/com_produce_material.vue b/src/views/modules/yieldReport/com_produce_material.vue
index cdf9f8f..146d59c 100644
--- a/src/views/modules/yieldReport/com_produce_material.vue
+++ b/src/views/modules/yieldReport/com_produce_material.vue
@@ -13,6 +13,7 @@
v-model="pageData.scanRmRollNo"
@keyup.native="recordTime"
@keyup.enter.native="checkRmRollNo"
+ @clear="clearMaterialInfo"
placeholder="请扫描或输入材料卷号"
size="large"
clearable>
@@ -38,8 +39,8 @@
-
-
+
+
@@ -279,12 +280,33 @@ export default {
/*关闭modal*/
closeDialog(){
+ // 清空物料信息
+ this.materialInfo = {
+ partNo: '',
+ partDesc: ''
+ };
+ // 清空输入框
+ this.pageData.scanRmRollNo = '';
+ this.pageData.rmRollNo = '';
+ this.pageData.bomItemNo = '';
+
//刷新报工的页面
this.$emit('refreshPageData');
//关闭当前的页面
this.$emit('update:visible', false);
},
+ /*清空物料信息*/
+ clearMaterialInfo(){
+ this.materialInfo = {
+ partNo: '',
+ partDesc: ''
+ };
+ this.pageData.rmRollNo = '';
+ this.pageData.bomItemNo = '';
+ this.bomList = [];
+ },
+
/*记录每一次录入字符串的时间*/
recordTime(){
//判断是否清掉所有的内容
@@ -594,20 +616,20 @@ export default {
padding: 0;
.action-btn {
- min-width: 100px;
- padding: 10px 24px;
- border-radius: 20px;
- font-size: 14px;
+ min-width: 80px;
+ padding: 6px 16px;
+ border-radius: 16px;
+ font-size: 13px;
font-weight: 500;
cursor: pointer;
transition: all 0.2s ease;
display: inline-flex;
align-items: center;
justify-content: center;
- gap: 6px;
+ gap: 4px;
i {
- font-size: 14px;
+ font-size: 13px;
}
&.primary {
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 4532012..b5d320b 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -204,7 +204,7 @@
质量检验
-
+
过程检验
@@ -231,7 +231,7 @@
- 列表信息
+ 过程记录
@@ -981,7 +981,7 @@ export default {
columnProp: "eventTime",
headerAlign: "center",
align: "center",
- columnLabel: "时间",
+ columnLabel: "开始时间",
columnWidth: 125,
columnHidden: false,
columnImage: false,
@@ -3335,7 +3335,7 @@ export default {
nextItemNo: ' 后道工序',
onlyCurrentRoll: '仅显示当前卷信息',
rollButtons: '卷操作',
- listDesc: '列表信息',
+ listDesc: '过程记录',
orderInfo: '订单信息',
timeList: '时间',
toolList: '刀模板记录',
@@ -3468,7 +3468,7 @@ export default {
tableId: '*'
}, {
functionId: functionId,
- languageValue: '列表信息',
+ languageValue: '过程记录',
objectId: 'listDesc',
objectType: 'label',
tableId: '*'