wilson
/
rongxing-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

右键菜单 ， 数量统计 ， 关闭状态 按钮控制 sxm 2022-3-15

master
[li_she] 4 years ago
parent
5a790692e8
commit
c22768758a
3 changed files with 188 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 78
      src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
  2. 40
      src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue
  3. 75
      src/views/modules/yieldReport/otherReport/rework_inspect_report.vue

78
src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
View File

@ -62,6 +62,7 @@
</el-form-item>
<el-form-item>
<el-button class="customer-bun-mid" type="primary" @click="switchRollModal"
:disabled="buttonTags.scannerRollFlag"
style="margin-left: 5px; margin-bottom: 5px;">
扫描卷
</el-button>
@ -94,6 +95,7 @@
<el-form-item style="margin-top: -12px ;">
<span slot="label" type="label" style="margin-top: -10px ;margin-left: 10px"> </span>
<el-button class="customer-bun-mid" type="primary" @click="separateRollModal"
:disabled="buttonTags.createNewRollFlag"
>
创建分卷
</el-button>
@ -207,6 +209,8 @@
height="200"
:data="sfdcDefectList"
border
show-summary
:summary-method="sfdcDefectListSummaries"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@ -232,6 +236,8 @@
height="250"
:data="sfdcRollList"
border
show-summary
:summary-method="sfdcRollListSummaries"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@ -294,6 +300,7 @@
</el-form-item>
<el-form-item style="margin-top: 20px ; margin-left: 10px">
<el-button class="customer-bun-mid" type="primary" @click="bulkInspection"
:disabled="buttonTags.bulkInspectionFlag"
style=" width: 80px; margin-bottom: 5px; ">
批量直接送检
</el-button>
@ -312,6 +319,7 @@
</el-button>
</div>
<el-button type="primary" style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"
:disabled="buttonTags.otherFlag"
slot="reference">其它操作
</el-button>
</el-popover>
@ -2233,7 +2241,7 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "序号",
columnWidth: 35,
columnWidth: 50,
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -2251,7 +2259,7 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "卷号",
columnWidth: 150,
columnWidth: 200,
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -2736,7 +2744,10 @@ export default {
defectFlag: false,
produceToolFlag: false,
materialFlag: false,
downTimeFlag: false
downTimeFlag: false,
scannerRollFlag:false,
otherFlag:false,
bulkInspectionFlag:false
},
dataListLoading: false,
createRoll: {
@ -2798,6 +2809,60 @@ export default {
notOverFinishRoll, /*未结生产订单下机*/
},
methods: {
// 不良记录
sfdcDefectListSummaries(param){
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index == 4){
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] ;
}
sums[index]+= sums[index]?sums[index]:0
}
});
return sums;
},
// 机器下机卷
sfdcRollListSummaries(param){
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '下机卷总数：';
return;
}
if (index == 14){
let list = data.filter(item => item.virtualRollFlag!='Y' && item.rollType !='删除卷')
const values = list.map(item => Number(item[column.property]));
let sum = 0
if (!values.every(value => isNaN(value))) {
sum = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
}
sums[0]+= sum?sum:0
}
});
return sums;
},
// 异常下机报工
notOverFinishRollModal() {
this.popoverFlag = false
@ -3074,9 +3139,16 @@ export default {
this.buttonTags.toolFlag = true;
this.buttonTags.materialFlag = true;
this.buttonTags.downTimeFlag = true;
this.buttonTags.scannerRollFlag = true;
this.buttonTags.mergeRollFlag = true;
this.buttonTags.otherFlag = true;
this.buttonTags.bulkInspectionFlag = true;
} else {
//存在人员既可以合并卷
this.buttonTags.otherFlag = false;
this.buttonTags.bulkInspectionFlag = false;
this.buttonTags.mergeRollFlag = false;
this.buttonTags.createNewRollFlag = false;
//刷新其他的菜单
await refreshWorkPlatformButtons(this.scheduleData).then(({data}) => {
if (data.resultMap.createNewRollFlag == 'Y') {

40
src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue
View File

@ -61,6 +61,7 @@
</el-form-item>
<el-form-item>
<el-button class="customer-bun-mid" type="primary" @click="switchRollModal"
:disabled="buttonTags.scannerRollFlag"
style="margin-left: 5px; margin-bottom: 5px;">
扫描卷
</el-button>
@ -93,6 +94,7 @@
<el-form-item style="margin-top: -12px ;">
<span slot="label" type="label" style="margin-top: -10px ;margin-left: 10px"> </span>
<el-button class="customer-bun-mid" type="primary" @click="separateRollModal"
:disabled="buttonTags.createNewRollFlag"
>
创建分卷
</el-button>
@ -167,6 +169,8 @@
height="250"
:data="sfdcRollList"
border
show-summary
:summary-method="sfdcRollListSummaries"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@ -2641,7 +2645,10 @@ export default {
defectFlag: false,
produceToolFlag: false,
materialFlag: false,
downTimeFlag: false
downTimeFlag: false,
scannerRollFlag:false,
otherFlag:false,
bulkInspectionFlag:false
},
dataListLoading: false,
createRoll: {
@ -2701,7 +2708,35 @@ export default {
bulkInspection, /**/
},
methods: {
// 机器下机卷
sfdcRollListSummaries(param){
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '下机卷总数：';
return;
}
if (index == 14){
let list = data.filter(item => item.virtualRollFlag!='Y' && item.rollType !='删除卷')
const values = list.map(item => Number(item[column.property]));
let sum = 0
if (!values.every(value => isNaN(value))) {
sum = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
}
sums[0]+= sum?sum:0
}
});
return sums;
},
// 批量直接送检
bulkInspection(){
this.scheduleData.operatorId = this.operatorData.operatorId
@ -2947,9 +2982,12 @@ export default {
this.buttonTags.toolFlag = true;
this.buttonTags.materialFlag = true;
this.buttonTags.downTimeFlag = true;
this.buttonTags.scannerRollFlag = true;
} else {
//存在人员既可以合并卷
this.buttonTags.mergeRollFlag = false;
this.buttonTags.scannerRollFlag = false;
this.buttonTags.createNewRollFlag = false;
//刷新其他的菜单
await refreshWorkPlatformButtons(this.scheduleData).then(({data}) => {
if (data.resultMap.createNewRollFlag == 'Y') {

75
src/views/modules/yieldReport/otherReport/rework_inspect_report.vue
View File

@ -61,6 +61,7 @@
</el-form-item>
<el-form-item>
<el-button class="customer-bun-mid" type="primary" @click="switchRollModal"
:disabled="buttonTags.scannerRollFlag"
style="margin-left: 5px; margin-bottom: 5px;">
扫描卷
</el-button>
@ -93,6 +94,7 @@
<el-form-item style="margin-top: -12px ;">
<span slot="label" type="label" style="margin-top: -10px ;margin-left: 10px"> </span>
<el-button class="customer-bun-mid" type="primary" @click="separateRollModal"
:disabled="buttonTags.createNewRollFlag"
>
创建分卷
</el-button>
@ -206,6 +208,8 @@
height="200"
:data="sfdcDefectList"
border
show-summary
:summary-method="sfdcDefectListSummaries"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@ -231,6 +235,8 @@
height="250"
:data="sfdcRollList"
border
show-summary
:summary-method="sfdcRollListSummaries"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
@ -293,6 +299,7 @@
</el-form-item>
<el-form-item style="margin-top: 20px ; margin-left: 10px">
<el-button class="customer-bun-mid" type="primary" @click="bulkInspection"
:disabled="buttonTags.bulkInspectionFlag"
style=" width: 80px; margin-bottom: 5px; ">
批量直接送检
</el-button>
@ -311,6 +318,7 @@
</el-button>
</div>
<el-button type="primary" style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"
:disabled="buttonTags.otherFlag"
slot="reference">其它操作
</el-button>
</el-popover>
@ -2737,7 +2745,10 @@ export default {
defectFlag: false,
produceToolFlag: false,
materialFlag: false,
downTimeFlag: false
downTimeFlag: false,
scannerRollFlag:false,
otherFlag:false,
bulkInspectionFlag:false
},
dataListLoading: false,
createRoll: {
@ -2799,6 +2810,60 @@ export default {
notOverFinishRoll
},
methods: {
// 不良记录
sfdcDefectListSummaries(param){
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index == 4){
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] ;
}
sums[index]+= sums[index]?sums[index]:0
}
});
return sums;
},
// 机器下机卷
sfdcRollListSummaries(param){
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '下机卷总数：';
return;
}
if (index == 14){
let list = data.filter(item => item.virtualRollFlag!='Y' && item.rollType !='删除卷')
const values = list.map(item => Number(item[column.property]));
let sum = 0
if (!values.every(value => isNaN(value))) {
sum = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
}
sums[0]+= sum?sum:0
}
});
return sums;
},
// 异常下机报工
notOverFinishRollModal() {
this.popoverFlag = false
@ -3062,6 +3127,7 @@ export default {
async refreshPageButtons() {
//判断是否存在人员
if (this.operatorData.operatorId == null || this.operatorData.operatorId == '') {
this.buttonTags.createNewRollFlag = true;
this.buttonTags.switchRollFlag = true;
this.buttonTags.separateRollFlag = true;
@ -3072,9 +3138,16 @@ export default {
this.buttonTags.toolFlag = true;
this.buttonTags.materialFlag = true;
this.buttonTags.downTimeFlag = true;
this.buttonTags.scannerRollFlag = true;
this.buttonTags.mergeRollFlag = true;
this.buttonTags.otherFlag = true;
this.buttonTags.bulkInspectionFlag = true;
} else {
//存在人员既可以合并卷
this.buttonTags.mergeRollFlag = false;
this.buttonTags.otherFlag = false;
this.buttonTags.bulkInspectionFlag = false;
this.buttonTags.createNewRollFlag = false;
//刷新其他的菜单
await refreshWorkPlatformButtons(this.scheduleData).then(({data}) => {
if (data.resultMap.createNewRollFlag == 'Y') {

Write Preview
Loading…
Cancel
Save