物料清单添加 Type 1-成品 2-毛坯

首检,终检添加开始时间
成品库,出库记录修改权限字符
This commit is contained in:
2024-05-24 10:48:05 +08:00
parent abccc2361c
commit 0cbca87e11
7 changed files with 131 additions and 44 deletions

View File

@@ -489,6 +489,8 @@
<tr>
<td>抛光数</td>
<td>{{ calculate_defectNumber }}</td>
<td>工单开始时间</td>
<td>{{ workOrderStartTime }}</td>
</tr>
</table>
</el-card>
@@ -514,6 +516,7 @@
get_previous_current_workorder,
accumulator_query,
writeProcessFlow_first,
GetQcQualityStatisticsFirstStartTime,
} from '@/api/qualityManagement/firstFQC.js'
import { mapState, mapGetters, mapMutations, mapActions } from 'vuex'
export default {
@@ -543,6 +546,8 @@
DMLdialog: {
visiable: false,
},
// 工单开始时间
workOrderStartTime: "",
toUpdateNum: 0, //弹窗更新值
toname: '',
toindex: 0, //索引
@@ -555,6 +560,22 @@
this.initMqtt();
this.getcurrentWorkorder()
},
watch: {
'CurrentWorkorder.clientWorkorder'(newValue, oldValue) {
if (newValue == null) {
this.workOrderStartTime = "";
return;
}
const data = {
workOrderId: newValue
}
GetQcQualityStatisticsFirstStartTime(data).then(res => {
if (res.code === 200) {
this.workOrderStartTime = res.data;
}
})
}
},
mounted() {},
computed: {
// 计算合格数

View File

@@ -12,13 +12,13 @@
</el-date-picker>
</el-form-item>
<el-form-item label="工单号">
<el-input v-model="search.workorderid" placeholder="输入工单号" :style="{ width: inputWidth }"></el-input>
<el-input v-model.trim="search.workorderid" placeholder="输入工单号" :style="{ width: inputWidth }"></el-input>
</el-form-item>
<el-form-item label="零件号">
<el-input v-model="search.partnumber" placeholder="输入零件号" :style="{ width: inputWidth }"></el-input>
<el-input v-model.trim="search.partnumber" placeholder="输入零件号" :style="{ width: inputWidth }"></el-input>
</el-form-item>
<el-form-item label="产品描述">
<el-input v-model="search.product_description" placeholder="输入产品描述" :style="{ width: inputWidth }"></el-input>
<el-input v-model.trim="search.product_description" placeholder="输入产品描述" :style="{ width: inputWidth }"></el-input>
</el-form-item>
<el-form-item label="班组">
<el-select v-model="search.team" placeholder="输入班组" :style="{ width: inputWidth }">
@@ -315,7 +315,6 @@
let query = { ...this.search, ...this.pagination }
delete query['reportType']
delete query['total']
console.log('query', query)
switch (this.search.reportType) {
case 0:
GetQualityStatisticsTable_first(query).then((res) => {

View File

@@ -455,10 +455,6 @@
<el-button type="primary" icon="el-icon-arrow-left" size="mini" @click="getPrevious_current_workorder">上一个工单</el-button>
</el-button-group>
</div>
<span>
<el-image style="width: 40px; height: 40px" :src="imageUrl" :preview-src-list="[imageUrl]">
</el-image>
</span>
<el-button type="primary" size="medium" @click="workOrderCompleted">本工单完成</el-button>
<table>
<tr>
@@ -493,6 +489,17 @@
<td>报废数</td>
<td>{{ calculate_scrapNumber }}</td>
</tr>
<tr>
<td>标签参考图片</td>
<td>
<span>
<el-image ref="elImageRef" style="width: 40px; height: 40px" :src="imageUrl" :preview-src-list="[imageUrl]">
</el-image>
</span>
</td>
<td>开始时间</td>
<td>{{ workOrderStartTime }}</td>
</tr>
</table>
</el-card>
</div>
@@ -522,6 +529,9 @@
generateQualityStatisticsTable,
} from '@/api/qualityManagement/thirtyFQC.js';
import {
GetQcQualityStatisticsFirstStartTime,
} from '@/api/qualityManagement/firstFQC.js'
import { convertToIncomingInspectionData } from '@/api/wmsManagement/wmFgentryInspect.js'
export default {
name: 'thirtyFQC',
@@ -551,6 +561,8 @@
DMLdialog: {
visiable: false,
},
// 工单开始时间
workOrderStartTime: "",
toUpdateNum: 0, //弹窗更新值
toname: '',
toindex: 0, //索引
@@ -562,10 +574,28 @@
created() {
this.initMqtt();
this.getcurrentWorkorder()
// this.startTimer()
},
mounted() {},
watch: {
// 工单变动
'CurrentWorkorder.clientWorkorder'(newValue, oldValue) {
this.showBigImageView();
if (newValue == null) {
this.workOrderStartTime = "";
return;
}
const data = {
workOrderId: newValue
}
GetQcQualityStatisticsFirstStartTime(data).then(res => {
if (res.code === 200) {
this.workOrderStartTime = res.data;
}
})
}
},
computed: {
@@ -1098,11 +1128,22 @@
}
this.mqttClient.publish(topic.OrderChange, emqxUtil.stringJSON(message));
}
}
},
// 大图触发
showBigImageView() {
this.$nextTick(() => {
this.$refs.elImageRef.clickHandler();
})
},
},
// 退出后关闭计时器
beforeDestroy() {
this.stopTimer()
},
}
</script>