From 60a71d062b9360bb2a1e3dd190d3b25251eefa29 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 25 三月 2025 16:55:37 +0800
Subject: [PATCH] 屏蔽原材料报检
---
src/views/system/user/index.vue | 19 ++++++---
src/views/business/rawMaterialInspection/index.vue | 20 +++++-----
src/views/business/outsourcedParts/index.vue | 54 ++++++++++++++++-----------
src/views/business/materialOrder/index.vue | 18 ++++----
4 files changed, 63 insertions(+), 48 deletions(-)
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 753a79c..ebdbcc9 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -22,8 +22,8 @@
</el-input>
</el-form-item>
<el-form-item label="鎶ユ绫诲瀷" prop="inspectionType">
- <el-select v-model="entity.inspectionType" clearable placeholder="璇烽�夋嫨" size="small"
- @change="refreshTable" style="width: 100%">
+ <el-select v-model="entity.inspectionType" clearable placeholder="璇烽�夋嫨" size="small" @change="refreshTable"
+ style="width: 100%">
<el-option label="鍘熻緟鏂�" value="鍘熻緟鏂�"></el-option>
<el-option label="鍖呮潗" value="鍖呮潗"></el-option>
</el-select>
@@ -269,13 +269,13 @@
this.exemption(row);
},
},
- {
- name: '鎾ら攢鎶ユ',
- type: 'text',
- clickFun: (row) => {
- this.cancelDeclare(row);
- },
- },
+ // {
+ // name: '鎾ら攢鎶ユ',
+ // type: 'text',
+ // clickFun: (row) => {
+ // this.cancelDeclare(row);
+ // },
+ // },
]
}
],
diff --git a/src/views/business/outsourcedParts/index.vue b/src/views/business/outsourcedParts/index.vue
index eaecbd8..335d700 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",
@@ -246,9 +254,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;
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index f2b893b..05311d4 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -325,16 +325,16 @@
return this.tabIndex === 0
},
},
- {
- name: '鎾ら攢鎶ユ',
- type: 'text',
- clickFun: (row) => {
- this.cancelDeclare(row);
- },
- showHide: (row) => {
- return this.tabIndex === 1
- },
- },
+ // {
+ // name: '鎾ら攢鎶ユ',
+ // type: 'text',
+ // clickFun: (row) => {
+ // this.cancelDeclare(row);
+ // },
+ // showHide: (row) => {
+ // return this.tabIndex === 1
+ // },
+ // },
]
}
],
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index b151160..878a405 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -47,7 +47,8 @@
</div>
</div>
<el-col>
- <el-table v-loading="loading" :data="userList" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
+ <el-table v-loading="loading" :data="userList"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" align="center" type="index" />
<el-table-column label="濮撳悕" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="璐﹀彿" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
@@ -59,7 +60,7 @@
</template>
</el-table-column>
<el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" width="120" />
- <el-table-column label="鎿嶄綔" align="center" width="160" class-nickName="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="160" class="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']">淇敼</el-button>
@@ -213,7 +214,7 @@
<el-col :span="8" style="height: 70vh;overflow: hidden;" v-if="companiesList.length != 1">
<el-input v-model="search2" placeholder="杈撳叆鍏抽敭瀛楁悳绱�" clearable size="small" @clear="searchFilter2"
@keyup.enter.native="searchFilter2" prefix-icon="el-icon-search" style="margin-bottom: 20px;width: 90%" />
- <el-tree :data="datathirdParty" node-key="companyId" :props="defaultProps" @node-click="nodeClick2"
+ <el-tree :data="datathirdParty" node-key="companyId" :props="defaultProps0" @node-click="nodeClick2"
style="height: calc(100% - 42px);" @node-expand="nodeOpen0" :filter-node-method="filterNode2" ref="tree2"
highlight-current>
</el-tree>
@@ -225,13 +226,13 @@
style="width: 50%" @keyup.enter.native="searchPerson()"></el-input>
</div>
<el-table height="67vh" stripe :data="personList" v-loading="personLoad" ref="personTable"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="50">
</el-table-column>
<el-table-column prop="employeeID" label="鍛樺伐鍙�">
</el-table-column>
- <el-table-column prop="nickName" label="鍛樺伐濮撳悕">
+ <el-table-column prop="name" label="鍛樺伐濮撳悕">
</el-table-column>
<el-table-column prop="department" label="閮ㄩ棬" min-width="200">
</el-table-column>
@@ -330,6 +331,10 @@
children: "children",
label: "label"
},
+ defaultProps0: {
+ children: "children",
+ label: "companyName"
+ },
// 鐢ㄦ埛瀵煎叆鍙傛暟
upload: {
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
@@ -411,7 +416,7 @@
addOb: {
fatherId: 10001,
nickName: '',
- },
+ }
};
},
watch: {
@@ -631,7 +636,7 @@
return data['companyName'].indexOf(value) !== -1;
},
addUser2() {
- if (this.multipleSelection.length === 0) {
+ if (this.ids.length === 0) {
return this.$message.error('璇烽�夋嫨浜哄憳')
}
if (this.currentCompaniesList.length === 0) {
--
Gitblit v1.9.3