From e642f80b8718f9315ff75edb1db773da239bf926 Mon Sep 17 00:00:00 2001
From: deslrey <deslre0381@gmail.com>
Date: 星期六, 10 一月 2026 11:30:59 +0800
Subject: [PATCH] 【物料属性】的回显和下拉列表
---
src/views/business/reportPreparation/index.vue | 75 +++++++++++++++++++++++++++++++------
1 files changed, 62 insertions(+), 13 deletions(-)
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index fb3275b..a468a76 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -4,7 +4,7 @@
<el-form :model="entity" ref="entity" size="small" :inline="true">
<el-form-item label="鎵瑰彿" prop="updateBatchNo">
<el-input v-model="entity.updateBatchNo" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable()">
+ @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
<el-form-item label="鎶ュ憡缂栧彿" prop="code">
@@ -21,10 +21,29 @@
<el-option v-for="(a, i) in typeSourceList" :key="i" :label="a.label" :value="a.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="妫�楠岀被鍒�" prop="orderType">
- <el-select v-model="entity.orderType" clearable size="small" @change="refreshTable()">
- <el-option v-for="(a, i) in orderTypeList" :key="i" :label="a.label" :value="a.value"></el-option>
- </el-select>
+
+ <el-form-item label="鐗╂枡灞炴��" prop="materialProp">
+ <el-select clearable size="small" v-model="entity.materialProp" style="width: 100%">
+ <el-option v-for="dict in dict.type.material_prop_type" :key="dict.value" :label="dict.label"
+ :value="dict.value"">
+ </el-option>
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label=" 妫�楠岀被鍒�" prop="orderType">
+ <el-select v-model="entity.orderType" clearable size="small" @change="refreshTable()">
+ <el-option v-for="(a, i) in orderTypeList" :key="i" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="闆朵欢鎻忚堪" prop="partDesc">
+ <el-input v-model="entity.partDesc" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplierName">
+ <el-input v-model="entity.supplierName" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable">
+ </el-input>
</el-form-item>
<el-form-item>
<el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
@@ -38,7 +57,7 @@
</div>
<div>
<lims-table :tableData="valueTableData" :column="column" :page="page" :tableLoading="tableLoading"
- :isSelection="true" :handleSelectionChange="handleChange" :height="'calc(100vh - 290px)'"
+ :isSelection="true" :handleSelectionChange="handleChange" :height="'calc(100vh - 320px)'"
@pagination="pagination" key="valueTableData">
<div slot="action" slot-scope="scope">
<el-button size="small" type="text" @click="viewIssued(scope.row)">鏌ョ湅鎶ュ憡</el-button>
@@ -192,8 +211,8 @@
<el-button size="small" style="height: 38px" type="primary">闄勪欢涓婁紶</el-button>
</el-upload>
</div>
- <lims-table :tableData="tableDataFile" :column="columnFile" height="600px"
- key="tableDataFile" :tableLoading="tableLoadingFile"></lims-table>
+ <lims-table :tableData="tableDataFile" :column="columnFile" height="600px" key="tableDataFile"
+ :tableLoading="tableLoadingFile"></lims-table>
</el-dialog>
</div>
</template>
@@ -214,10 +233,11 @@
import { mapGetters } from "vuex";
import { selectUserCondition } from "@/api/business/inspectionTask";
import limsTable from "@/components/Table/lims-table.vue";
-import {delFile, downFile, getFileList} from "@/api/business/rawMaterialOrder";
+import { delFile, downFile, getFileList } from "@/api/business/rawMaterialOrder";
export default {
name: 'ReportPreparation',
components: { limsTable, onlyoffice },
+ dicts: ['material_prop_type'],
data() {
return {
entity: {
@@ -225,6 +245,7 @@
code: null,
typeSource: null,
orderType: null,
+ materialProp: null
},
page: {
current: 1,
@@ -259,7 +280,8 @@
verifyUser: null, // 瀹℃牳浜哄憳
loadingVerify: false, // 瀹℃牳浜哄憳
typeSourceList: [
- { label: '鎴愬搧涓嬪崟', value: 0 },
+ { label: '濮旀墭涓嬪崟', value: -1 },
+ { label: '澶栬喘涓嬪崟', value: 0 },
{ label: '鍘熸潗鏂欎笅鍗�', value: 1 },
],
orderTypeList: [
@@ -350,6 +372,16 @@
width: "120px",
},
{
+ label: "闆朵欢鎻忚堪",
+ prop: "partDesc",
+ width: "120px",
+ },
+ {
+ label: "渚涘簲鍟嗗悕绉�",
+ prop: "supplierName",
+ width: "120px",
+ },
+ {
label: "鎶ュ憡缂栧彿",
prop: "code",
width: "160px",
@@ -363,11 +395,28 @@
dataType: "tag",
formatData: (params) => {
if (params == 0) {
- return "鎴愬搧涓嬪崟";
- } else {
+ return "澶栬喘涓嬪崟";
+ } else if (params == 1) {
return "鍘熸潗鏂欎笅鍗�";
+ } else {
+ return "濮旀墭涓嬪崟";
}
},
+ },
+ {
+ label: '鐗╂枡灞炴��',
+ prop: 'materialProp',
+ formatData: (params) => {
+ if (!params) return null
+
+ for (let i = 0; i < this.dict.type.material_prop_type.length; i++) {
+ const item = this.dict.type.material_prop_type[i]
+ if (item.value == params) {
+ return item.label
+ }
+ }
+ return null
+ }
},
{
label: "妫�楠岀被鍨�",
@@ -535,7 +584,7 @@
// 鏌ヨ闄勪欢鏌ョ湅鍒楄〃鍥炶皟
getFileList() {
this.tableLoadingFile = true
- getFileList({ insOrderId: this.filesLookInfo.insOrderId,current: -1, size: -1 }).then(res => {
+ getFileList({ insOrderId: this.filesLookInfo.insOrderId, current: -1, size: -1 }).then(res => {
this.tableLoadingFile = false
if (res.code === 200) {
this.tableDataFile = res.data.records
--
Gitblit v1.9.3