From 4b9dfff19ff70db47f99cb93070d0650267c6896 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 06 三月 2025 16:22:19 +0800
Subject: [PATCH] 检验任务-添加查看工时功能
---
src/views/business/materialOrder/customsInspection.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 939ad23..797161c 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -235,7 +235,7 @@
</el-table-column>
<el-table-column align="center" label="寰呮椤规暟閲�" prop="quantity" width="105">
<template slot-scope="scope">
- <el-select v-model="scope.row.quantity" :disabled="active>1|| scope.$index !== 0 || sampleList.length > 1" clearable
+ <el-select v-model="scope.row.quantity" disabled clearable
size="small">
<el-option v-for="item in quantityList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
@@ -639,6 +639,17 @@
this.currentId = this.$route.query.currentId
this.isReport = this.$route.query.isReport
this.customsInspection = this.$route.query.customsInspection
+ this.getInfo();
+ },
+ activated() {
+ this.active = this.$route.query.active
+ this.orderType = this.$route.query.orderType
+ this.currentId = this.$route.query.currentId
+ this.isReport = this.$route.query.isReport
+ this.customsInspection = this.$route.query.customsInspection
+ this.getInfo();
+ },
+ getInfo() {
this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
this.getInfo() // 鑾峰彇鏁版嵁
@@ -893,10 +904,6 @@
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
return
}
- if (!this.sampleList.every(m => m.quantity)) {
- this.$message.error('璇烽�夋嫨寰呮椤规暟閲�')
- return
- }
const sampleList = this.HaveJson(this.sampleList)
sampleList.forEach(item => {
item.insProduct = this.productList
@@ -1014,7 +1021,6 @@
}),
}).then(res => {
this.noNeedCheckLoad = false
- if (res.code == 201) return
this.noNeedCheckDia = false
this.$message.success('宸叉彁浜�')
this.closeOpenPage()
@@ -1832,7 +1838,11 @@
return row[property] === value;
},
goBack () {
- this.$router.go(-1)
+ if (this.active == 1) {
+ this.$router.go(-1)
+ } else {
+ this.closeOpenPage()
+ }
},
closeOpenPage() {
this.$router.go(-1)
--
Gitblit v1.9.3