diff --git a/src/api/yieldReport/produce_report_normal.js b/src/api/yieldReport/produce_report_normal.js
index fa9052b..3eb698d 100644
--- a/src/api/yieldReport/produce_report_normal.js
+++ b/src/api/yieldReport/produce_report_normal.js
@@ -72,6 +72,9 @@ export const getScheduleDateShift = data => createAPI('schedule/getScheduleDateS
// 批量送检
export const workbenchPostinspection = data => createAPI('schedule/workbenchPostinspection','POST',data)
+// 返工重检 下机卷列表
+export const getReworkSfdcRollByCon = data => createAPI('schedule/getReworkSfdcRollByCon', 'POST', data)
+
diff --git a/src/assets/scss/_base.scss b/src/assets/scss/_base.scss
index 6e67445..c6121b0 100644
--- a/src/assets/scss/_base.scss
+++ b/src/assets/scss/_base.scss
@@ -362,3 +362,4 @@ img {
vertical-align: middle;
margin-right: 5px;
}
+
diff --git a/src/element-ui/index.js b/src/element-ui/index.js
index c5df5ab..e89d736 100644
--- a/src/element-ui/index.js
+++ b/src/element-ui/index.js
@@ -147,3 +147,54 @@ Vue.prototype.$message = Message;
Vue.prototype.$ELEMENT = { size: 'medium' }
+Vue.prototype.$message = function (msg) {
+ //根据msg对象中的type类型判断消息提示的类型
+ let msgObj = {
+ message: msg.message ? msg.message : msg,
+ duration: 3000
+ }
+ let msgType = msg.type || ""
+ switch (msgType) {
+ case 'success':
+ return Message.success(msgObj);
+ break;
+
+ case 'warning':
+ return Message.warning(msgObj);
+ break;
+
+ case 'error':
+ return Message.error(msgObj);
+ break;
+
+ default:
+ return Message(msgObj);
+
+ }
+}
+//分别对success、warning ,error info等样式进行设置
+Vue.prototype.$message.success = function (msg) {
+ return Message.success({
+ message: msg,
+ duration: 1000
+ })
+}
+Vue.prototype.$message.warning = function (msg) {
+ return Message.warning({
+ message: msg,
+ duration: 1000
+ })
+}
+Vue.prototype.$message.error = function (msg) {
+ return Message.error({
+ message: msg,
+ duration: 1500
+ })
+}
+Vue.prototype.$message.info = function (msg) {
+ return Message.info({
+ message: msg,
+ duration: 1000
+ })
+}
+
diff --git a/src/views/modules/yieldReport/otherReport/bulk_inspection.vue b/src/views/modules/yieldReport/otherReport/bulk_inspection.vue
index 005f7c8..3d94233 100644
--- a/src/views/modules/yieldReport/otherReport/bulk_inspection.vue
+++ b/src/views/modules/yieldReport/otherReport/bulk_inspection.vue
@@ -82,6 +82,7 @@ export default {
data() {
return {
currentDate: '',
+ repairOrderFlag: '',
shift: '',
visible: false,
operatorId: '',
@@ -132,8 +133,10 @@ export default {
},
methods: {
- init(val) {
+ init(val,val2) {
this.visible = true
+ this.repairOrderFlag = val2
+ console.log(this.repairOrderFlag)
this.sfdcRolls.site = val.site
this.sfdcRolls.orderNo = val.orderNo
this.sfdcRolls.itemNo = val.itemNo
@@ -175,7 +178,7 @@ export default {
resourceId: this.sfdcRolls.resourceId,
scheduleDate: this.currentDate,
rollNo: item.rollNo,
- repairOrderFlag: 'N',
+ repairOrderFlag: this.repairOrderFlag ,
operatorId: this.operatorId,
currentDatetime: this.scheduleDateShiftDto.currentDateTime ,
remark: ''
diff --git a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
index d82fd07..2d3728d 100644
--- a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
@@ -2775,7 +2775,7 @@ export default {
// 批量直接送检
bulkInspection(){
this.$nextTick(() => {
- this.$refs.bulkInspection.init(this.scheduleData)
+ this.$refs.bulkInspection.init(this.scheduleData,'N')
});
},
// 不良信息列表
@@ -2814,8 +2814,10 @@ export default {
if (data.code == 0) {
this.$message.success(data.msg)
this.getSfdcDefectList();
- } else {
+ } else if(data.code == 500){
this.$message.error(data.msg)
+ } else {
+ this.$message.warning(data.msg)
}
})
},
diff --git a/src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue b/src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue
new file mode 100644
index 0000000..32da032
--- /dev/null
+++ b/src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue
@@ -0,0 +1,3487 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 仅显示当前卷信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 仅显示当前卷信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+