From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/business/inspectionTask/components/EditInspectionItem.vue | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/src/views/business/inspectionTask/components/EditInspectionItem.vue b/src/views/business/inspectionTask/components/EditInspectionItem.vue
index 78d3735..fc13ce9 100644
--- a/src/views/business/inspectionTask/components/EditInspectionItem.vue
+++ b/src/views/business/inspectionTask/components/EditInspectionItem.vue
@@ -6,20 +6,25 @@
width="80%"
@close="editInspectionDia = false"
>
- <TableCard :showTitle="false">
- <template v-slot:table>
- <lims-table
- :column="editColumn"
- :table-data="editTableData"
- :table-loading="editLoading"
- :page="page"
- height="600"
- style="padding: 0 15px"
- @pagination="pagination"
- >
- </lims-table>
- </template>
- </TableCard>
+ <div>
+ <el-form :model="entity" :inline="true">
+ <el-form-item label="妫�楠岄」" prop="outputWorkTime">
+ <el-input v-model="entity.inspectionItem" clearable size="small"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button size="small" type="primary" @click="getTableData">鏌ヨ</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <lims-table
+ :column="editColumn"
+ :table-data="editTableData"
+ :table-loading="editLoading"
+ :page="page"
+ height="560"
+ @pagination="pagination"
+ >
+ </lims-table>
</el-dialog>
<el-dialog :visible.sync="editAskDia" title="淇敼" width="50%">
<el-form ref="form" :model="editForm" label-width="100px">
@@ -38,7 +43,7 @@
style="width: 100%"
>
<el-option
- v-for="dict in dict.type.inspection_value_type"
+ v-for="dict in inspectionValueType"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@@ -60,7 +65,6 @@
</template>
<script>
-import TableCard from "@/components/TableCard/index.vue";
import limsTable from "@/components/Table/lims-table.vue";
import {
selectSampleAndProductByOrderId,
@@ -69,14 +73,14 @@
export default {
name: "EditInspectionItem",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { TableCard, limsTable },
+ components: { limsTable },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
- dicts: ["inspection_value_type"],
editInspectionDia: false,
entity: {
id: 0,
+ inspectionItem: ''
},
editColumn: [
{
@@ -164,7 +168,13 @@
inspectionValueType: "",
},
handleEditLoading: false,
+ inspectionValueType: [],
};
+ },
+ mounted() {
+ this.getDicts("inspection_value_type").then((response) => {
+ this.inspectionValueType = this.dictToValue(response.data);
+ });
},
// 鏂规硶闆嗗悎
methods: {
@@ -182,9 +192,8 @@
})
.then((res) => {
this.editLoading = false;
- if (res.code === 201) return;
- this.editTableData = res.data.body.records;
- this.page.total = res.data.body.total;
+ this.editTableData = res.data.records;
+ this.page.total = res.data.total;
})
.catch(() => {
this.editLoading = false;
@@ -207,7 +216,6 @@
updateProductOnPlan(params)
.then((res) => {
this.handleEditLoading = false;
- if (res.code === 201) return;
this.$message.success("淇敼鎴愬姛");
this.editAskDia = false;
this.getTableData();
--
Gitblit v1.9.3