From 889114a6c8362ca54586781f5bf284afa83dffaf Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 06 三月 2025 17:06:02 +0800
Subject: [PATCH] 检验任务提交流程修改
---
src/views/business/inspectionTask/components/viewManHourDia.vue | 18 ++++++++++++++++--
src/views/business/inspectionTask/inspection.vue | 13 ++++++++++++-
src/views/business/inspectionTask/index.vue | 2 +-
3 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/views/business/inspectionTask/components/viewManHourDia.vue b/src/views/business/inspectionTask/components/viewManHourDia.vue
index f076e3b..54268fd 100644
--- a/src/views/business/inspectionTask/components/viewManHourDia.vue
+++ b/src/views/business/inspectionTask/components/viewManHourDia.vue
@@ -18,7 +18,11 @@
</div>
<lims-table :tableData="tableData0" :column="column0"
:page="page0" :tableLoading="tableLoading"
- height="560" @pagination="pagination0"></lims-table>
+ height="500" @pagination="pagination0"></lims-table>
+ <span slot="footer" class="dialog-footer" v-if="insState == 99">
+ <el-button @click="editInspectionDia = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="handleSubmit">纭� 瀹�</el-button>
+ </span>
</el-dialog>
<el-dialog :visible.sync="editAskDia" title="淇敼" width="50%">
<el-form ref="form" :model="editForm" label-width="100px">
@@ -74,6 +78,7 @@
orderId: 0,
inspectionItem: ''
},
+ insState: 0,
tableData0: [],
tableLoading: false,
column0: [
@@ -102,6 +107,9 @@
clickFun: (row) => {
this.editIns(row);
},
+ disabled: (row) => {
+ return this.insState == 3 || this.insState == 5 || this.insState == 99
+ },
},
],
},
@@ -128,7 +136,8 @@
},
// 鏂规硶闆嗗悎
methods: {
- showDialog(id) {
+ showDialog(id, insState) {
+ this.insState = insState
this.editInspectionDia = true;
this.entity.orderId = id;
this.getList0();
@@ -167,6 +176,11 @@
this.handleEditLoading = false;
});
},
+ // 纭宸ユ椂
+ handleSubmit () {
+ this.editInspectionDia = false;
+ this.$emit("submit");
+ },
pagination0({ page, limit }) {
this.page0.current = page;
this.page0.size = limit;
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index b514734..eabfb22 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -646,7 +646,7 @@
},
// 鏌ョ湅宸ユ椂
viewManHour(row) {
- this.$refs.viewManHourDia.showDialog(row.id);
+ this.$refs.viewManHourDia.showDialog(row.id, row.insState);
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 182cff4..55af32e 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -23,7 +23,7 @@
@click="openUnPassDialog('add')">涓嶅悎鏍煎鐞�</el-button>
<el-button size="small" type="primary" @click="sampleVisible = true; uploadSample();">鏍峰搧鍒囨崲</el-button>
<!-- <el-button v-if="state == 1" size="small" type="primary" @click="taskVisible = true">浠诲姟鍒囨崲</el-button>-->
- <el-button v-if="state == 1" size="small" type="primary" @click="addVerifyDia = true">鎻愪氦</el-button>
+ <el-button v-if="state == 1" size="small" type="primary" @click="viewManHour">鎻愪氦</el-button>
<!-- 澶嶆牳 -->
<el-button v-if="state == 2" size="medium" type="primary" @click="openAddCheck">閫氳繃</el-button>
<el-button v-if="state == 2" size="medium" @click="upInsReview(0)">涓嶉�氳繃</el-button>
@@ -509,6 +509,8 @@
:unPassCheck="unPassCheck" @closeUnPassCheckDialog="closeUnPassCheckDialog" @refreshView="refreshView" />
<purchase-verification v-if="purchaseDialog" ref="purchaseDialog" :orderId="orderId"
:purchaseDialog="purchaseDialog" @resetPurchaseDialog="resetPurchaseDialog"></purchase-verification>
+ <!--鏌ョ湅宸ユ椂寮规-->
+ <viewManHourDia ref="viewManHourDia" @submit="openAddVerifyDia"></viewManHourDia>
</div>
</template>
@@ -542,9 +544,11 @@
import DataWorker from '../../../DataWorker.worker';
import html2canvas from "html2canvas";
import { mapGetters } from "vuex";
+import viewManHourDia from "@/views/business/inspectionTask/components/viewManHourDia.vue";
export default {
name: 'Inspection',
components: {
+ viewManHourDia,
PurchaseVerification,
AddUnPass,
limsTable,
@@ -2582,6 +2586,13 @@
this.$message.error("鏈緭鍏ヤ笉閫氳繃鍘熷洜");
}
},
+ // 鏌ョ湅宸ユ椂
+ viewManHour() {
+ this.$refs.viewManHourDia.showDialog(this.id, 99);
+ },
+ openAddVerifyDia () {
+ this.addVerifyDia = true;
+ },
submit() {
if (this.verifyUser === null || this.verifyUser === "") {
this.$message.error("璇锋寚瀹氬鏍镐汉鍛�");
--
Gitblit v1.9.3