|
|
@@ -244,22 +244,7 @@
|
|
|
v-for="(item, index) in getFambeQualityList"
|
|
|
:key="index"
|
|
|
>
|
|
|
- <!-- <div
|
|
|
- class="handler-diversion"
|
|
|
- @click="qualityTesting(item, '1')"
|
|
|
- :style="{
|
|
|
- 'background-color':
|
|
|
- item.diversionItem &&
|
|
|
- item.diversionItem.isEaLingKiln === 1
|
|
|
- ? '#429153'
|
|
|
- : '#c9c9c9'
|
|
|
- }"
|
|
|
- >
|
|
|
- <span class="fambe-no">{{
|
|
|
- item.famBeNo | fambeNoFormat
|
|
|
- }}</span>
|
|
|
- <span>转道</span>
|
|
|
- </div> -->
|
|
|
+
|
|
|
<p class="imgBox" @click="qualityTesting(item, '0')">
|
|
|
<img
|
|
|
v-if="item.isEaLingKiln == 0 && item.startTime == null"
|
|
|
@@ -283,11 +268,7 @@
|
|
|
>空</span
|
|
|
>
|
|
|
<div class="message-box" v-else>
|
|
|
- <!-- <div class="left-block"></div>
|
|
|
- <div class="block-text">
|
|
|
- <span>板</span>
|
|
|
- <span>砌</span>
|
|
|
- </div> -->
|
|
|
+
|
|
|
<div style="line-height: 53px">
|
|
|
出釜未检 | <span class="font12"> 已等待 </span
|
|
|
>{{ item.startTime | computedTimeSlot }}小时
|
|
|
@@ -329,11 +310,7 @@
|
|
|
>空釜</span
|
|
|
>
|
|
|
<div class="message-box" style="padding-top: 5px" v-else>
|
|
|
- <!-- <div class="left-block"></div>
|
|
|
- <div class="block-text" style="top: 0">
|
|
|
- <span>板</span>
|
|
|
- <span>砌</span>
|
|
|
- </div> -->
|
|
|
+
|
|
|
<div class="font12">
|
|
|
入釜时间: {{ item.startTime }} {{
|
|
|
item.pressure
|
|
|
@@ -394,12 +371,7 @@
|
|
|
{{ item.number == 0 ? '空窑' : item.number + '/' + 18 }}
|
|
|
</span>
|
|
|
<div class="entry-kiln message-box" v-else>
|
|
|
- <!-- <div class="left-block"></div>
|
|
|
- <div class="block-text" style="top: 0">
|
|
|
- <span>板</span>
|
|
|
- <span>砌</span>
|
|
|
- </div> -->
|
|
|
- <!-- <div class="font12" style="padding-left: 22px"> -->
|
|
|
+
|
|
|
<div class="font12">
|
|
|
{{ item.startTime | formatYear }}~{{
|
|
|
item.endTime | formatYear
|
|
|
@@ -491,7 +463,6 @@
|
|
|
}}</span>
|
|
|
</template></el-table-column
|
|
|
>
|
|
|
- <!-- <el-table-column></el-table-column> -->
|
|
|
<el-table-column
|
|
|
prop="productName"
|
|
|
align="center"
|
|
|
@@ -524,19 +495,13 @@
|
|
|
@click="onekeyScrapFun(scope.row)"
|
|
|
>报废</el-button
|
|
|
>
|
|
|
- <!-- <el-button
|
|
|
- size="small"
|
|
|
- type="text"
|
|
|
- @click="handleSelectKilnEntry(scope.row)"
|
|
|
- >编组</el-button
|
|
|
- > -->
|
|
|
+
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<div class="handle-input">
|
|
|
<div>
|
|
|
- <!-- <div style="width: 180px; margin-right: 5px"></div> -->
|
|
|
<el-button type="primary" size="small" @click="handleFormGroups"
|
|
|
>小车编组</el-button
|
|
|
>
|
|
|
@@ -556,7 +521,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="entry" @click="handleGroupEntry">
|
|
|
- <span >编组进窑</span>
|
|
|
+ <span>编组进窑</span>
|
|
|
<i class="el-icon-caret-right"></i>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -591,9 +556,7 @@
|
|
|
<template v-slot="scope">
|
|
|
<div>{{ scope.row.vehicleNo }}</div>
|
|
|
</template>
|
|
|
- <!-- <template v-slot="scope">
|
|
|
- <div>{{ (scope.$index + 1) | fambeNoFormat }}</div>
|
|
|
- </template> -->
|
|
|
+
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="productCode"
|
|
|
@@ -657,9 +620,7 @@
|
|
|
</div>
|
|
|
<div v-else>{{ scope.row.scrapReason }}</div>
|
|
|
</div>
|
|
|
- <!-- <el-input
|
|
|
- class="table-input"
|
|
|
- v-model.number="scope.row.scrapReason"></el-input> -->
|
|
|
+
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table-column>
|
|
|
@@ -684,7 +645,6 @@
|
|
|
</div>
|
|
|
<div v-else>{{ scope.row.cutRepairReason }}</div>
|
|
|
</div>
|
|
|
-
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table-column>
|
|
|
@@ -709,9 +669,7 @@
|
|
|
</div>
|
|
|
<div v-else>{{ scope.row.correctReason }}</div>
|
|
|
</div>
|
|
|
- <!-- <el-input
|
|
|
- class="table-input"
|
|
|
- v-model.number="scope.row.correctReason"></el-input> -->
|
|
|
+
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table-column>
|
|
|
@@ -736,12 +694,7 @@
|
|
|
width=""
|
|
|
align="center"
|
|
|
></el-table-column>
|
|
|
- <!-- <el-table-column
|
|
|
- prop="planId"
|
|
|
- label="计划号"
|
|
|
- width=""
|
|
|
- align="center"
|
|
|
- ></el-table-column> -->
|
|
|
+
|
|
|
<el-table-column
|
|
|
prop="total"
|
|
|
label="总数量(块)"
|
|
|
@@ -796,11 +749,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column label="入库仓库" align="center" width="120">
|
|
|
- <template v-slot="scope">
|
|
|
- <span>{{ scope.row.depotName }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column> -->
|
|
|
+
|
|
|
<el-table-column label="入库仓库" align="center" width="120">
|
|
|
<template v-slot="scope">
|
|
|
<el-select v-model="scope.row.depotId">
|
|
|
@@ -961,7 +910,7 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="editVisible = false">关闭</el-button>
|
|
|
<el-button
|
|
|
- v-if="isEaLingKiln != 1&&seat=='当前窑'"
|
|
|
+ v-if="isEaLingKiln != 1 && seat == '当前窑'"
|
|
|
type="primary"
|
|
|
@click="ealingKilnFun"
|
|
|
>封窑</el-button
|
|
|
@@ -1079,31 +1028,21 @@ import { mapState } from 'vuex';
|
|
|
import * as echarts from 'echarts';
|
|
|
|
|
|
import {
|
|
|
- getPutMeshWorkOrderByPage,
|
|
|
onekeyGetFambeState,
|
|
|
ListEnter,
|
|
|
- getCuttingIntoKiln,
|
|
|
ToOnekeyFambe,
|
|
|
onekeyScrap,
|
|
|
onekeyStop,
|
|
|
getFambeByPage,
|
|
|
saveFambeWorkOrder,
|
|
|
ealingKiln,
|
|
|
- getFambeNo,
|
|
|
- getFambeKettle,
|
|
|
ToOnekeyKettle,
|
|
|
- getFambeQuality,
|
|
|
- ToOnekeyQuality,
|
|
|
getQualityDetails,
|
|
|
getQualityDetails2,
|
|
|
- getDepotList,
|
|
|
qualitySubmits,
|
|
|
queryCount,
|
|
|
getTeamGroup,
|
|
|
enterWarehouse,
|
|
|
- selectFailTraitPage,
|
|
|
- getAutoclaveBITwo,
|
|
|
- getThermometerBITwo,
|
|
|
revokeWork,
|
|
|
qualityTestingTurnReach,
|
|
|
qualityEnterWarehouse,
|
|
|
@@ -1111,16 +1050,9 @@ import {
|
|
|
// queryKilnXCH
|
|
|
} from '@/api/manufacture/spreadWorkOrder';
|
|
|
import dictMixins from '@/mixins/dictMixins';
|
|
|
-import {
|
|
|
-
|
|
|
- getWarehouseList,
|
|
|
-
|
|
|
- // queryKilnXCH
|
|
|
-} from '@/api/mes';
|
|
|
-
|
|
|
+import { getWarehouseList } from '@/api/mes';
|
|
|
export default {
|
|
|
mixins: [dictMixins],
|
|
|
-
|
|
|
data() {
|
|
|
return {
|
|
|
pageLoading: false,
|
|
|
@@ -1265,15 +1197,7 @@ export default {
|
|
|
// this.getOnekeyWorkReportByPageFun()
|
|
|
this.getDateMeg('today');
|
|
|
}, 180000);
|
|
|
- // this.getDay(0)
|
|
|
- // this.getDay(-1)
|
|
|
- // this.getDate('s', 0)
|
|
|
- // this.getDate('e', 0)
|
|
|
- // this.getMonday('2022-10')
|
|
|
- // if(this.cuttingTaskTableData.length > 0) {
|
|
|
- // const ids = this.cuttingTaskTableData.map(item => item.id)
|
|
|
- // this._getCuttingTaskData(ids)
|
|
|
- // }
|
|
|
+
|
|
|
},
|
|
|
methods: {
|
|
|
_initEcharts() {
|
|
|
@@ -1614,65 +1538,20 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
this.qualityTestingData2.forEach((item) => {
|
|
|
- let text =[];
|
|
|
+ let text = [];
|
|
|
this.qualityTestingData.forEach((val) => {
|
|
|
if (item.productCode == val.productCode) {
|
|
|
- if(val[this.choiceReasonType]){
|
|
|
- text.push(...(val[this.choiceReasonType].split(',')))
|
|
|
-
|
|
|
+ if (val[this.choiceReasonType]) {
|
|
|
+ text.push(...val[this.choiceReasonType].split(','));
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
- if(text.length>0){
|
|
|
- console.log(text)
|
|
|
- item[this.choiceReasonType]=[...new Set(text)].toString()
|
|
|
-
|
|
|
+ if (text.length > 0) {
|
|
|
+ console.log(text);
|
|
|
+ item[this.choiceReasonType] = [...new Set(text)].toString();
|
|
|
}
|
|
|
});
|
|
|
- // console.log(this.choiceReasonType)
|
|
|
- // console.log(this.choiceReasonRow)
|
|
|
- // 每次选择原因之前先清空
|
|
|
- // for (let key in this.qualityTestTable2) {
|
|
|
- // this.qualityTestTable2[key][this.choiceReasonType] = [];
|
|
|
- // }
|
|
|
- // for (let i = 0; i < this.qualityTestingData.length; i++) {
|
|
|
- // let item = this.qualityTestingData[i];
|
|
|
- // if (item.id === this.choiceReasonRow.id) {
|
|
|
- // if (!this.traitChecked[0]) {
|
|
|
- // this.traitChecked.splice(0, 1);
|
|
|
- // }
|
|
|
- // this.qualityTestingData[i][this.choiceReasonType] =
|
|
|
- // this.traitChecked.join(',');
|
|
|
- // // break
|
|
|
- // }
|
|
|
|
|
|
- // // 将选择的原因汇总到下面表格2
|
|
|
- // for (let key in this.qualityTestTable2) {
|
|
|
- // if (key == item.model + item.planParentId) {
|
|
|
- // if (item[this.choiceReasonType]) {
|
|
|
- // this.qualityTestTable2[item.model + item.planParentId][
|
|
|
- // this.choiceReasonType
|
|
|
- // ].push(item[this.choiceReasonType]);
|
|
|
- // let tempReason =
|
|
|
- // this.qualityTestTable2[item.model + item.planParentId][
|
|
|
- // this.choiceReasonType
|
|
|
- // ];
|
|
|
- // let tempStr = tempReason.join();
|
|
|
- // tempReason = tempStr.split(',');
|
|
|
- // this.qualityTestTable2[item.model + item.planParentId][
|
|
|
- // this.choiceReasonType
|
|
|
- // ] = [...new Set(tempReason)];
|
|
|
- // }
|
|
|
- // // 将汇总好的原因丢到表格2列表中显示现在页面
|
|
|
- // this.qualityTestingData2.map((c) => {
|
|
|
- // if (c.model + c.planParentId == key) {
|
|
|
- // c[this.choiceReasonType] =
|
|
|
- // this.qualityTestTable2[key][this.choiceReasonType].join(',');
|
|
|
- // }
|
|
|
- // });
|
|
|
- // }
|
|
|
- // }
|
|
|
- // }
|
|
|
this.traitChecked = [];
|
|
|
this.innerVisible = false;
|
|
|
},
|
|
|
@@ -1826,7 +1705,7 @@ export default {
|
|
|
};
|
|
|
const data = await saveFambeWorkOrder(obj);
|
|
|
if (data.data.code == 0) {
|
|
|
- this.editVisible=false
|
|
|
+ this.editVisible = false;
|
|
|
this.$message({
|
|
|
type: 'success',
|
|
|
message: '转道成功!'
|
|
|
@@ -2137,7 +2016,6 @@ export default {
|
|
|
if (obj.taskList.length == 0) {
|
|
|
return this.$alert('请选择至少一条数据和模数！');
|
|
|
}
|
|
|
-
|
|
|
|
|
|
// 判断addModelsObj里addModulus(输入的模数)是否＞cuttingMargin(切割余量)
|
|
|
let flag = false;
|
|
|
@@ -2155,7 +2033,7 @@ export default {
|
|
|
if (flag) {
|
|
|
return this.$alert('报工模数不能大于切割余量！');
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
this.tempModelsList = this.addModelsList;
|
|
|
try {
|
|
|
this.pageLoading = true;
|
|
|
@@ -2481,7 +2359,7 @@ export default {
|
|
|
// 判断如果输入了数量就校验原因是否选择
|
|
|
for (let i = 0; i < this.qualityTestingData.length; i++) {
|
|
|
let item = this.qualityTestingData[i];
|
|
|
- console.log(item)
|
|
|
+ console.log(item);
|
|
|
if (Number(item.correctNumber) > 0 && !item.correctReason) {
|
|
|
return this.$message.warning('请选择降品/修正原因');
|
|
|
}
|
|
|
@@ -2829,7 +2707,6 @@ export default {
|
|
|
align-items: center;
|
|
|
justify-content: center;
|
|
|
cursor: pointer;
|
|
|
-
|
|
|
}
|
|
|
p {
|
|
|
width: 70px;
|
2213980799@qq.com