From 1997d52296ee89f4b7833c19e2e37ea2b5408e22 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 三月 2025 10:12:51 +0800
Subject: [PATCH] Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable
---
src/views/business/outsourcedParts/index.vue | 55 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/src/views/business/outsourcedParts/index.vue b/src/views/business/outsourcedParts/index.vue
index eaecbd8..a8851a9 100644
--- a/src/views/business/outsourcedParts/index.vue
+++ b/src/views/business/outsourcedParts/index.vue
@@ -20,7 +20,7 @@
</el-form>
<div>
<el-button size="mini" type="primary">鑾峰彇璁㈠崟</el-button>
- <el-button size="mini" type="primary" @click="openAdd('鏂板')">鏂板</el-button>
+ <!-- <el-button size="mini" type="primary" @click="openAdd('鏂板')">鏂板</el-button> -->
</div>
</div>
<lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 220px)'"
@@ -59,9 +59,17 @@
</el-input>
</el-form-item>
<el-form-item label="妫�娴嬬粨鏋�" prop="result" v-if="title == '妫�楠�'">
- <el-switch v-model="addForm.result" active-text="鍚堟牸" inactive-text="涓嶅悎鏍�" active-value="鍚堟牸"
+ <el-select v-model="value" placeholder="璇烽�夋嫨">
+ <el-option label="鍚堟牸" value="鍚堟牸">
+ </el-option>
+ <el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�">
+ </el-option>
+ <el-option label="涓嶅垽鏂�" value="涓嶅垽鏂�">
+ </el-option>
+ </el-select>
+ <!-- <el-switch v-model="addForm.result" active-text="鍚堟牸" inactive-text="涓嶅悎鏍�" active-value="鍚堟牸"
inactive-value="涓嶅悎鏍�">
- </el-switch>
+ </el-switch> -->
</el-form-item>
<el-form-item label="娴嬭瘯鏂囦欢" prop="file" v-if="title == '妫�楠�'">
<el-upload action="#" :auto-upload="false" :multiple="false"
@@ -120,23 +128,23 @@
dataType: "action",
label: "鎿嶄綔",
operation: [
- {
- name: "缂栬緫",
- type: "text",
- clickFun: (row) => {
- this.openAdd("缂栬緫", row);
- },
- },
- {
- name: "鍒犻櫎",
- type: "text",
- clickFun: (row) => {
- this.handleDelete(row);
- },
- disabled: (row) => {
- return !!row.ratifyUser
- },
- },
+ // {
+ // name: "缂栬緫",
+ // type: "text",
+ // clickFun: (row) => {
+ // this.openAdd("缂栬緫", row);
+ // },
+ // },
+ // {
+ // name: "鍒犻櫎",
+ // type: "text",
+ // clickFun: (row) => {
+ // this.handleDelete(row);
+ // },
+ // disabled: (row) => {
+ // return !!row.ratifyUser
+ // },
+ // },
{
name: "妫�楠�",
type: "text",
@@ -180,6 +188,7 @@
this.getDicts("inspection_task_state").then((response) => {
this.inspectionTaskState = this.dictToValue(response.data);
});
+ this.getList()
},
methods: {
getList() {
@@ -246,9 +255,11 @@
// 妫�楠�
let fd = new FormData();
//鏂囦欢淇℃伅涓璻aw鎵嶆槸鐪熺殑鏂囦欢
- if (this.file) {
- fd.append("file", this.file.raw);
+ if (this.addForm.file) {
+ fd.append("file", this.addForm.file.raw);
}
+ fd.append("inspectionItems", this.addForm.inspectionItems);
+ fd.append("result", this.addForm.result);
}
} else {
return false;
--
Gitblit v1.9.3