diff --git a/src/api/qualityManagement/firstFQC.js b/src/api/qualityManagement/firstFQC.js
index 58df818..ad79f27 100644
--- a/src/api/qualityManagement/firstFQC.js
+++ b/src/api/qualityManagement/firstFQC.js
@@ -56,4 +56,13 @@ export function writeProcessFlow_first(query) {
method: 'get',
params: query,
})
+}
+
+//获取工单开始时间 string workOrderId
+export function GetQcQualityStatisticsFirstStartTime(query) {
+ return request({
+ url: '/mes/qc/FQC/getQcQualityStatisticsFirstStartTime',
+ method: 'get',
+ params: query,
+ })
}
\ No newline at end of file
diff --git a/src/views/qualityManagement/FQC/firstFQC.vue b/src/views/qualityManagement/FQC/firstFQC.vue
index 1b1486e..d32905a 100644
--- a/src/views/qualityManagement/FQC/firstFQC.vue
+++ b/src/views/qualityManagement/FQC/firstFQC.vue
@@ -489,6 +489,8 @@
| 抛光数 |
{{ calculate_defectNumber }} |
+ 工单开始时间 |
+ {{ workOrderStartTime }} |
@@ -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: {
// 计算合格数
diff --git a/src/views/qualityManagement/FQC/qualityStatistics.vue b/src/views/qualityManagement/FQC/qualityStatistics.vue
index 278a8e4..a79d7b0 100644
--- a/src/views/qualityManagement/FQC/qualityStatistics.vue
+++ b/src/views/qualityManagement/FQC/qualityStatistics.vue
@@ -12,13 +12,13 @@
-
+
-
+
-
+
@@ -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) => {
diff --git a/src/views/qualityManagement/FQC/thirtyFQC.vue b/src/views/qualityManagement/FQC/thirtyFQC.vue
index 3c0bc88..265a88c 100644
--- a/src/views/qualityManagement/FQC/thirtyFQC.vue
+++ b/src/views/qualityManagement/FQC/thirtyFQC.vue
@@ -455,10 +455,6 @@
上一个工单
-
-
-
-
本工单完成
@@ -493,6 +489,17 @@
| 报废数 |
{{ calculate_scrapNumber }} |
+
+ | 标签参考图片 |
+
+
+
+
+
+ |
+ 开始时间 |
+ {{ workOrderStartTime }} |
+
@@ -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()
},
+
+
+
}
diff --git a/src/views/wmsManagement/WmGoodsNowProduction.vue b/src/views/wmsManagement/WmGoodsNowProduction.vue
index ffa70f7..17a2d32 100644
--- a/src/views/wmsManagement/WmGoodsNowProduction.vue
+++ b/src/views/wmsManagement/WmGoodsNowProduction.vue
@@ -100,7 +100,7 @@
-
-
+
+
diff --git a/src/views/wmsManagement/WmMaterial.vue b/src/views/wmsManagement/WmMaterial.vue
index 19b6cd3..22e6db1 100644
--- a/src/views/wmsManagement/WmMaterial.vue
+++ b/src/views/wmsManagement/WmMaterial.vue
@@ -28,11 +28,13 @@
-
-
+
+
+
+
-
+
{{
item.dictLabel
}}
@@ -46,16 +48,16 @@
- 新增物料记录
+ 新增物料记录
- 批量导入
+ 批量导入
- 批量修改
+ 批量修改
- 批量删除
+ 批量删除
@@ -83,8 +85,8 @@
-
-
+
+
@@ -115,81 +117,83 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
+
+
-
+
@@ -231,8 +235,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- sort: null,
- sortType: null,
+ status: 1,
+ type: 1,
},
// 弹出层标题
title: '',
@@ -241,7 +245,10 @@
// 是否显示弹出层
open: false,
// 表单参数
- form: {},
+ form: {
+ status: 1,
+ type: 1,
+ },
columns: [
{ index: 1, key: 'partnumber', label: `物料号（零件号）`, checked: true },
{ index: 2, key: 'u8InventoryCode', label: `U8库存编码`, checked: true },
@@ -253,7 +260,7 @@
{ index: 8, key: 'description', label: `显示描述(产品描述+颜色+规格)`, checked: true },
{ index: 9, key: 'version', label: `版本号`, checked: false },
{ index: 10, key: 'remarks', label: `备注`, checked: false },
- { index: 14, key: 'status', label: `状态（0-不可见 1-可见）`, checked: false },
+ { index: 14, key: 'status', label: `状态`, checked: false },
],
// 状态（0-不可见 1-可见）选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
statusOptions: [
@@ -265,6 +272,15 @@
dictLabel: '弃用',
dictValue: 0,
}, ],
+ typeList: [
+ {
+ label: '成品',
+ value: 1
+ },
+ {
+ label: '毛坯',
+ value: 2
+ }, ],
// 数据列表
dataList: [],
// 总记录数
@@ -364,8 +380,9 @@
version: undefined,
remarks: undefined,
sort: undefined,
- search1: undefined,
+ search1: '',
search2: undefined,
+ type: 1,
status: 1,
createdBy: undefined,
createdTime: undefined,