diff --git a/src/api/fixedCarrier/fixedCarrier.js b/src/api/fixedCarrier/fixedCarrier.js
index cc2b727..3fe4ca4 100644
--- a/src/api/fixedCarrier/fixedCarrier.js
+++ b/src/api/fixedCarrier/fixedCarrier.js
@@ -33,7 +33,8 @@ export const fixedCarrierDelete = data => createAPI('fixedCarrier/delete', 'POST
* @param data
* @returns {*}
*/
-export const getSiteAndBuByUserName = data => createAPI('qc/getSiteAndBuByUserName', 'POST', data)
+export const getSiteAndBuByUserName = data => createAPI('/pms/qc/getSiteAndBuByUserName', 'POST', data)
+
diff --git a/src/views/modules/fixedCarrier/fixedCarrier.vue b/src/views/modules/fixedCarrier/fixedCarrier.vue
index 5b47497..3be7678 100644
--- a/src/views/modules/fixedCarrier/fixedCarrier.vue
+++ b/src/views/modules/fixedCarrier/fixedCarrier.vue
@@ -42,9 +42,9 @@
border
v-loading="dataListLoading"
style="width: 100%;">
-
+
-
+
@@ -78,7 +78,7 @@
-
+
@@ -102,15 +102,15 @@
-
+
-
+
-
+
@@ -193,7 +193,7 @@
-
+
保存
关闭
@@ -228,7 +228,7 @@ export default {
pageIndex: 1,
pageSize: 20,
totalPage: 0,
- height: 500,
+ height: 200,
dataList: [],
dataListLoading: false,
modalFlag: false,
@@ -255,15 +255,38 @@ export default {
},
userBuList: [],
rules: {
- buNo: [{ required: true, message: '请选择BU', trigger: 'change' }],
- carrierNo: [{ required: true, message: '请输入标签条码', trigger: 'blur' }],
- carrierTypeCode: [{ required: true, message: '请输入载具类型编码', trigger: 'blur' }],
- carrierTypeName: [{ required: true, message: '请输入载具类型名称', trigger: 'blur' }],
- status: [{ required: true, message: '请选择状态', trigger: 'change' }]
+ buNo: [{
+ required: true,
+ message: ' ',
+ trigger: ['blur','change']
+ }],
+ carrierNo: [{
+ required: true,
+ message: ' ',
+ trigger: ['blur','change']
+ }],
+ carrierTypeCode: [{
+ required: true,
+ message: ' ',
+ trigger: ['blur','change']
+ }],
+ carrierTypeName: [{
+ required: true,
+ message: ' ',
+ trigger: ['blur','change']
+ }],
+ status: [{
+ required: true,
+ message: ' ',
+ trigger: ['blur','change']
+ }]
}
}
},
mounted() {
+ this.$nextTick(() => {
+ this.height = window.innerHeight - 170
+ })
this.getSiteAndBu()
this.getDataList()
},
@@ -285,7 +308,7 @@ export default {
this.dataListLoading = true
this.searchData.page = this.pageIndex
this.searchData.limit = this.pageSize
-
+
fixedCarrierSearch(this.searchData).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.page.list.map(item => {
@@ -428,7 +451,7 @@ export default {
'使用次数': item.totalUsageCount,
'创建时间': item.createDate
}))
-
+
excel.export_json_to_excel({
header: ['BU', '标签条码', '载具类型编码', '载具类型名称', '规格描述', '尺寸', '状态', '当前位置', '使用次数', '创建时间'],
data: exportData.map(item => Object.values(item)),
@@ -446,3 +469,4 @@ export default {
+
diff --git a/src/views/modules/yieldReport/com_mrb_register.vue b/src/views/modules/yieldReport/com_mrb_register.vue
index cd38191..6b27b22 100644
--- a/src/views/modules/yieldReport/com_mrb_register.vue
+++ b/src/views/modules/yieldReport/com_mrb_register.vue
@@ -4,7 +4,7 @@
MRB
-
+
质检单
@@ -143,7 +143,7 @@ export default {
if (data.code === 0 || data.code === 200) {
this.$message.success('MRB异常单登记成功');
this.$emit('update:visible', false);
- // 触发确认事件，通知父组件打开过程检验对话框
+ // 触发确认事件，通知父组件刷新状态（不再打开过程检验对话框）
this.$emit('confirmed');
} else {
this.$message.error(data.msg || 'MRB异常单登记失败');
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 6bdcde1..f53dee7 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -585,14 +585,14 @@
-
过程检验
-
MRB异常单
@@ -4649,21 +4649,28 @@ export default {
});
},
- // 质量检验相关方法
- qualityInspectionModal() {
- // 先打开MRB异常单登记对话框
+ // 打开过程检验对话框
+ openProcessInspectionModal() {
+ // 直接打开过程检验对话框
+ this.showProcessInspectionFlag = true;
+ // 刷新过程检验待检验记录数量
+ this.checkProcessInspectionPendingCount();
+ },
+
+ // 打开MRB异常单登记对话框
+ openMrbRegisterModal() {
+ // 直接打开MRB异常单登记对话框
this.showMrbRegisterFlag = true;
this.$nextTick(() => {
this.$refs.comMrbRegister.init(this.scheduleData);
});
},
- // MRB异常单确认后的回调
+ // MRB异常单确认后的回调（不再打开过程检验对话框）
onMrbConfirmed() {
- // MRB异常单登记成功后，打开过程检验对话框
- // 查询过程检验待检验记录数量
+ // MRB异常单登记成功后，只刷新过程检验按钮状态
this.checkProcessInspectionPendingCount();
- this.showProcessInspectionFlag = true;
+ // 不再自动打开过程检验对话框
},
// 查询过程检验待检验记录数量