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/materialOrder/index.vue | 161 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 131 insertions(+), 30 deletions(-)
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 8c4152a..e84a6a3 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -3,66 +3,87 @@
<div>
<div class="search">
<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="goSearch">
</el-input>
</el-form-item>
+
<el-form-item label="濮旀墭缂栧彿" prop="entrustCode" v-if="tabIndex !== 0">
<el-input v-model="entity.entrustCode" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter.native="goSearch">
</el-input>
</el-form-item>
+
<el-form-item label="闆朵欢鍙�" prop="partNo">
- <el-input v-model="entity.partNo" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="goSearch">
+ <el-input v-model="entity.partNo" clearable placeholder="璇疯緭鍏�" size="small" @keyup.enter.native="goSearch">
</el-input>
</el-form-item>
+
<el-form-item label="闆朵欢鎻忚堪" prop="partDesc">
- <el-input v-model="entity.partDesc" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="goSearch">
+ <el-input v-model="entity.partDesc" clearable placeholder="璇疯緭鍏�" size="small" @keyup.enter.native="goSearch">
</el-input>
</el-form-item>
+
+ <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>
<el-button v-if="tabIndex === 2 || tabIndex === 3 || tabIndex === 4"
- :icon="!more ? 'el-icon-arrow-down' : 'el-icon-arrow-up'" style="color: #3A7BFA;" type="text"
- @click="more = !more">{{ !more ? '鏇村' : '鏀惰捣' }}</el-button>
- <el-button size="mini" type="primary" @click="goSearch">鏌ヨ</el-button>
- <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
+ :icon="!more ? 'el-icon-arrow-down' : 'el-icon-arrow-up'" style="color: #3A7BFA;" type="text"
+ @click="more = !more">{{ !more ? '鏇村' : '鏀惰捣' }}</el-button>
+ <el-button size="mini" type="primary" @click="goSearch">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
</el-form-item>
+
<el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplierName"
v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
<el-input v-model="entity.supplierName" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter.native="goSearch">
</el-input>
</el-form-item>
+
<el-form-item label="鏍峰搧鍨嬪彿" prop="sampleModel"
v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
<el-input v-model="entity.sampleModel" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter.native="goSearch">
</el-input>
</el-form-item>
+
<el-form-item label="妫�楠岀姸鎬�" prop="inspectStatus"
v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
<el-select v-model="entity.inspectStatus" clearable size="small" @change="goSearch">
<el-option v-for="(a, i) in inspectStatusList" :key="i" :label="a.label" :value="a.value"></el-option>
</el-select>
</el-form-item>
+
<el-form-item label="涓嬪彂鏃堕棿" prop="date" v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
- <el-date-picker v-model="entity.date" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡" @change="goSearch"
- range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" type="daterange" value-format="yyyy-MM-dd">
+ <el-date-picker v-model="entity.date" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
+ @change="goSearch" range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" type="daterange"
+ value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
+
</el-form>
</div>
<div class="table">
<div class="table-tab">
<div>
<ul class="tab">
- <li :class="{ active: tabIndex === 0 }" v-if="checkPermi(['get:raw:await'])" @click="handleTab(0)">寰呬笅鍗�</li>
- <li :class="{ active: tabIndex === 1 }" v-if="checkPermi(['get:raw:testing'])" @click="handleTab(1)">妫�楠屼腑</li>
- <li :class="{ active: tabIndex === 2 }" v-if="checkPermi(['get:raw:check'])" @click="handleTab(2)">宸叉楠�</li>
- <li :class="{ active: tabIndex === 4 }" v-if="checkPermi(['get:raw:quarterCheck'])" @click="handleTab(4)">瀛ｅ害妫�楠�</li>
+ <li :class="{ active: tabIndex === 0 }" v-if="checkPermi(['get:raw:await'])" @click="handleTab(0)">寰呬笅鍗�
+ </li>
+ <li :class="{ active: tabIndex === 1 }" v-if="checkPermi(['get:raw:testing'])" @click="handleTab(1)">妫�楠屼腑
+ </li>
+ <li :class="{ active: tabIndex === 2 }" v-if="checkPermi(['get:raw:check'])" @click="handleTab(2)">宸叉楠�
+ </li>
+ <li :class="{ active: tabIndex === 4 }" v-if="checkPermi(['get:raw:quarterCheck'])" @click="handleTab(4)">
+ 瀛ｅ害妫�楠�</li>
<li :class="{ active: tabIndex === 3 }" v-if="checkPermi(['get:Ifs:ByAll'])" @click="handleTab(3)">鍏ㄩ儴</li>
</ul>
</div>
@@ -76,8 +97,8 @@
<!--寰呬笅鍗�-->
<div class="table">
<lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0" @pagination="pagination"
- ref="tableData" :rowClassName="changeRowClass" :height="'calc(100vh - 290px)'"
- key="tableData" :page="page" :tableLoading="tableLoading"></lims-table>
+ ref="tableData" :rowClassName="changeRowClass" :height="'calc(100vh - 290px)'" key="tableData" :page="page"
+ :tableLoading="tableLoading"></lims-table>
</div>
<!--妫�楠屼腑-->
<div class="table">
@@ -121,7 +142,7 @@
<!-- 鎾ら攢鎶ユ -->
<el-dialog :visible.sync="declareDialogVisible" title="鎶ユ鎾ら攢" width="30%">
<p style="font-size:16px;color:#333333">鎵瑰彿<span style="color:#34BD66">{{ this.insOrderRow.updateBatchNo
- }}</span>鐨勪俊鎭槸鍚�<span style="color: #FF4902">鎾ら攢鎶ユ</span>
+ }}</span>鐨勪俊鎭槸鍚�<span style="color: #FF4902">鎾ら攢鎶ユ</span>
</p>
<span slot="footer" class="dialog-footer">
<el-row>
@@ -205,22 +226,39 @@
getOrderCountByIfsId
} from "@/api/business/rawMaterialOrder";
import { getWarehouseSubmit } from "@/api/business/materialInspection";
-import {mapGetters} from "vuex";
+import { mapGetters } from "vuex";
// import Inspection from "../do/b1-inspect-order-plan/Inspection.vue";
export default {
name: "MaterialOrder",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: { limsTable, DownFileDialog, FilesLookVisible, DataLookVisible, ShowInfo, PrintDialog },
+ dicts: ['material_prop_type'],
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
+ materialProps: [],
tableData: [],
tableLoading: false,
column: [
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
{ label: '闆朵欢鍙�', prop: 'partNo' },
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
+ {
+ 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
+ }
+ },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -301,6 +339,21 @@
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
{ label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
+ {
+ 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
+ }
+ },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -441,6 +494,21 @@
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
{
+ 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
+ }
+ },
+ {
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
prop: 'isExpire',
@@ -554,7 +622,7 @@
tableData3: [],
tableLoading3: false,
column3: [
- { label: '濮旀墭缂栧彿', prop: 'entrustCode',width: "160px", },
+ { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: "160px", },
{
dataType: 'tag',
label: '妫�楠岀姸鎬�',
@@ -626,6 +694,21 @@
},
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
+ {
+ 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
+ }
+ },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -678,7 +761,7 @@
tableData4: [],
tableLoading4: false,
column4: [
- { label: '濮旀墭缂栧彿', prop: 'entrustCode',width: "160px", },
+ { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: "160px", },
{
dataType: 'tag',
label: '妫�楠岀姸鎬�',
@@ -750,6 +833,21 @@
},
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
+ {
+ 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
+ }
+ },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -827,6 +925,7 @@
date: null,
beginDeclareDate: null,
endDeclareDate: null,
+ materialProp: null,
},
tabList: [
{
@@ -903,7 +1002,7 @@
}
this.refreshTable()
},
- activated () {
+ activated() {
this.refreshTable()
},
// 鏂规硶闆嗗悎
@@ -945,6 +1044,8 @@
if (res.code === 200) {
this.tableData = res.data.records
this.page.total = res.data.total
+
+ console.log('data ======> ', this.tableData)
}
}).catch(err => {
this.tableLoading = false
@@ -967,7 +1068,7 @@
// 宸叉楠屾煡璇�
getIfsByOverList() {
this.tableLoading2 = true
- if(null != this.entity.date){
+ if (null != this.entity.date) {
this.entity.beginDeclareDate = this.entity.date[0]
this.entity.endDeclareDate = this.entity.date[1]
} else {
@@ -988,7 +1089,7 @@
// 鏌ヨ瀛ｅ害妫�楠�
getIfsByQuarterList() {
this.tableLoading4 = true
- if(null != this.entity.date){
+ if (null != this.entity.date) {
this.entity.beginDeclareDate = this.entity.date[0]
this.entity.endDeclareDate = this.entity.date[1]
} else {
@@ -1009,7 +1110,7 @@
// 鍏ㄩ儴
getIfsByAllList() {
this.tableLoading3 = true
- if(null != this.entity.date){
+ if (null != this.entity.date) {
this.entity.beginDeclareDate = this.entity.date[0]
this.entity.endDeclareDate = this.entity.date[1]
} else {
@@ -1192,20 +1293,20 @@
// 涓嬪崟
playOrder(row) {
//鏌ヨ褰撳墠鎵规鏄惁宸茬粡涓嬪崟
- getOrderCountByIfsId(row.id).then(res=>{
- if(res.code===200 && res.data>0){
+ getOrderCountByIfsId(row.id).then(res => {
+ if (res.code === 200 && res.data > 0) {
this.$message.warning('璇ユ壒娆″凡涓嬪崟锛岃鍕块噸澶嶄笅鍗�')
this.refreshTable('page')
return
}
- this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: {isOutsourcing:'f', orderType: 0, customsInspection: row, active: 1 } });
- }).catch(error=>{
+ this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: { isOutsourcing: 'f', orderType: 0, customsInspection: row, active: 1 } });
+ }).catch(error => {
console.error(error)
})
},
// 瀛ｅ害妫�楠屼笅鍗�
playOrderSec(row) {
- this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: {isOutsourcing:'f', orderType: 1, customsInspection: row, active: 1 } });
+ this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: { isOutsourcing: 'f', orderType: 1, customsInspection: row, active: 1 } });
},
// 鐐瑰嚮鏍峰搧鍚嶇О鏌ョ湅璇︽儏
selectAllByOne(row) {
@@ -1366,7 +1467,7 @@
if (this.multipleSelection.length > 0) {
params.ids = this.multipleSelection.map(item => item.id).join(',');
} else {
- params = {...this.entity}
+ params = { ...this.entity }
}
params.orderType = "01raw";
rawAllExport(params).then(res => {
--
Gitblit v1.9.3