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/inspectionTask/index.vue | 114 +++++++++++++++++++++++++--------------------------------
1 files changed, 50 insertions(+), 64 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 4c59a35..b514734 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -196,7 +196,7 @@
鏂板
</el-button>
</div>
- <el-table :data="bindTableData" style="width: 100%" height="70vh">
+ <el-table :data="bindTableData" style="width: 100%" height="70vh" v-loading="bindTableDataLoading">
<el-table-column prop="inspectionItemClass" label="妫�楠岄」鍒嗙被" width="150">
</el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" width="150">
@@ -232,7 +232,10 @@
ref="showInfoDialog"
:showInfoDialog="showInfoDialog"
></ShowInfo> -->
+ <!--淇敼妫�楠屽�煎脊妗�-->
<edit-inspection-item ref="editInspectionItem"></edit-inspection-item>
+ <!--鏌ョ湅宸ユ椂寮规-->
+ <viewManHourDia ref="viewManHourDia"></viewManHourDia>
</div>
</template>
@@ -240,6 +243,7 @@
import { getYearAndMonthAndDays } from "@/utils/date";
import EditInspectionItem from "./components/EditInspectionItem.vue";
import limsTable from "@/components/Table/lims-table.vue";
+import viewManHourDia from "./components/viewManHourDia.vue"
import {
claimInsOrderPlan,
upPlanUser2,
@@ -254,9 +258,11 @@
} from "@/api/business/inspectionTask.js";
import { mapGetters } from "vuex";
export default {
+ name: 'InspectionTask',
components: {
EditInspectionItem,
limsTable,
+ viewManHourDia
},
dicts: ["urgency_level", "inspection_task_state"],
computed: {
@@ -267,6 +273,7 @@
InspectionKey: 1,
bindDialogVisible: false,
bindAddDialogVisible: false,
+ bindTableDataLoading: false,
bindTableData: [],
bindAddTableData: [],
chooseBindAddList: [],
@@ -374,6 +381,9 @@
formatData: (params) => {
return this.urgencyLevel.find((m) => m.value == params).label;
},
+ formatType: (params) => {
+ return this.urgencyLevel.find((m) => m.value == params).type;
+ },
},
{
label: "妫�楠岀被鍨�",
@@ -392,8 +402,7 @@
prop: "insState",
dataType: "tag",
formatData: (params) => {
- return this.inspectionTaskState.find((m) => m.value == params)
- .label;
+ return this.inspectionTaskState.find((m) => m.value == params).label;
},
formatType: (params) => {
return this.inspectionTaskState.find((m) => m.value == params).type;
@@ -424,9 +433,17 @@
this.editInspection(row);
},
disabled: (row) => {
- return (
- row.userName == null || row.insState == 3 || row.insState == 5
- );
+ return (row.userName == null || row.insState == 3 || row.insState == 5) && this.checkPermi(['update:product:onPlan'])
+ },
+ },
+ {
+ name: "鏌ョ湅宸ユ椂",
+ type: "text",
+ clickFun: (row) => {
+ this.viewManHour(row);
+ },
+ showHide: (row) => {
+ return this.checkPermi(['get:working:hours:byOrder'])
},
},
{
@@ -517,10 +534,20 @@
prop: "insResult",
dataType: "tag",
formatData: (params) => {
- return this.insResultList.find((m) => m.value == params).label;
+ let obj = this.insResultList.find((m) => m.value == params)
+ if (obj) {
+ return this.insResultList.find((m) => m.value == params).label;
+ } else {
+ return null
+ }
},
formatType: (params) => {
- return this.insResultList.find((m) => m.value == params).type;
+ let obj = this.insResultList.find((m) => m.value == params)
+ if (obj) {
+ return this.insResultList.find((m) => m.value == params).type;
+ } else {
+ return null
+ }
},
},
{
@@ -554,7 +581,7 @@
// 鏁版嵁鏌ョ湅鐩稿叧瀛楁---缁撴潫
};
},
- created() {
+ mounted() {
this.getAuthorizedPerson();
this.currentTime = getYearAndMonthAndDays();
this.getDicts("urgency_level").then((response) => {
@@ -563,10 +590,10 @@
this.getDicts("inspection_task_state").then((response) => {
this.inspectionTaskState = this.dictToValue(response.data);
});
- },
- mounted() {
+ this.refreshTable();
this.queryParams.userId = this.userId;
- // this.getPower();
+ },
+ activated() {
this.refreshTable();
},
methods: {
@@ -617,48 +644,14 @@
editInspection(row) {
this.$refs.editInspectionItem.showDialog(row.id);
},
- // 鍒锋柊椤甸潰
- refreshView() {
- this.getList();
+ // 鏌ョ湅宸ユ椂
+ viewManHour(row) {
+ this.$refs.viewManHourDia.showDialog(row.id);
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
this.lookInfo = row;
this.getLookList();
- },
- // 鏉冮檺鍒嗛厤
- getPower(radio) {
- let power = JSON.parse(sessionStorage.getItem("power"));
- let inspection = false;
- let connect = false;
- let review = false;
- let claim = false;
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == "doInsOrder") {
- inspection = true;
- }
- if (power[i].menuMethod == "upPlanUser") {
- connect = true;
- }
- if (power[i].menuMethod == "verifyPlan") {
- review = true;
- }
- if (power[i].menuMethod == "claimInsOrderPlan") {
- claim = true;
- }
- }
- if (!claim) {
- this.componentData.do.splice(3, 1);
- }
- if (!review) {
- this.componentData.do.splice(2, 1);
- }
- if (!connect) {
- this.componentData.do.splice(1, 1);
- }
- if (!inspection) {
- this.componentData.do.splice(0, 1);
- }
},
changeCheckBox(val) {
this.queryParams.userId = val ? 0 : null;
@@ -974,10 +967,6 @@
})
.then((res) => {
this.loading = false;
- if (res.code == 201) {
- this.$message.error("缁戝畾澶辫触");
- return;
- }
this.$message.success("缁戝畾鎴愬姛");
this.bindAddDialogVisible = false;
this.getBinding(this.bindCurrentInfo);
@@ -992,17 +981,14 @@
cancelButtonText: "鍙栨秷",
type: "warning",
}).then(async () => {
- delProductTreeByProductId({ productId: row.id })
- .then((res) => {
- if (res.coe == 201) {
- // this.$message.error('鏈粦瀹氭楠岄」')
- return;
- }
- this.getBinding(this.bindCurrentInfo);
- })
- .catch((error) => {
- console.error(error);
- });
+ this.bindTableDataLoading = true
+ delProductTreeByProductId({ productId: row.id }).then((res) => {
+ this.bindTableDataLoading = false
+ this.getBinding(this.bindCurrentInfo);
+ }).catch((error) => {
+ this.bindTableDataLoading = false
+ console.error(error);
+ });
});
},
},
--
Gitblit v1.9.3