From 4c4fe478fabb409c904802d53f121db090ec3dca Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 25 二月 2026 14:44:30 +0800
Subject: [PATCH] 业务管理：1.原材料标签打印内容调整；2.成品抽样页面优化；3.页面刷新保留筛选条件
---
src/views/business/outsourcingFinishProduct/index.vue | 161 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 99 insertions(+), 62 deletions(-)
diff --git a/src/views/business/outsourcingFinishProduct/index.vue b/src/views/business/outsourcingFinishProduct/index.vue
index 1acea36..d3ae946 100644
--- a/src/views/business/outsourcingFinishProduct/index.vue
+++ b/src/views/business/outsourcingFinishProduct/index.vue
@@ -3,6 +3,12 @@
<div>
<div class="search">
<el-form :model="entity" ref="entity" size="small" :inline="true">
+ <el-form-item label="IFS鍩�" prop="contract">
+ <el-select @keyup.enter.native="refreshTable" v-model="entity.contract" clearable placeholder="璇烽�夋嫨" size="small">
+ <el-option label="ZTNS" value="ZTNS"/>
+ <el-option label="KJNS" value="KJNS"/>
+ </el-select>
+ </el-form-item>
<el-form-item label="鎵瑰彿" prop="updateBatchNo">
<el-input v-model="entity.updateBatchNo" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter.native="goSearch">
@@ -23,26 +29,18 @@
</el-form-item>
<el-form-item label="鐗╂枡灞炴��" prop="materialProp">
- <el-select clearable size="small" v-model="entity.materialProp" style="width: 100%">
+ <el-select clearable size="small" v-model="entity.materialProp" style="width: 100%" @change="refreshTable()">
<el-option v-for="dict in dict.type.material_prop_type" :key="dict.value" :label="dict.label"
- :value="dict.value"">
+ :value="dict.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label=" 渚涘簲鍟嗗悕绉�" prop="supplierName">
- <el-input v-model="entity.supplierName" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="goSearch">
- </el-input>
+ <el-input v-model="entity.supplierName" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="goSearch">
+ </el-input>
</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>
- </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"
@@ -60,6 +58,13 @@
@change="goSearch" range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
+ </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>
</el-form-item>
</el-form>
</div>
@@ -124,7 +129,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>
@@ -187,7 +192,7 @@
</template>
<script>
-import PrintDialog from "@/views/business/materialOrderComponents/materialOrder/printDialog.vue";
+import PrintDialog from "@/views/business/outsourcingFinishProduct/components/printDialog.vue";
import ShowInfo from "@/views/business/materialOrderComponents/materialOrder/showInfo.vue";
import DataLookVisible from "@/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue";
import FilesLookVisible from "@/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue";
@@ -217,6 +222,25 @@
tableData: [],
tableLoading: false,
column: [
+ {
+ label: 'IFS鍩�',
+ prop: 'contract',
+ width: '120px',
+ dataType: 'tag',
+ formatData: (params) => {
+ return params
+ },
+ formatType: (params) => {
+ if (params === 'ZTNS') {
+ return ''
+ } else if (params === 'KJNS') {
+ return 'success'
+ }else {
+ return null
+ }
+ }
+
+ },
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
{ label: '闆朵欢鍙�', prop: 'partNo' },
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
@@ -295,6 +319,25 @@
tableData1: [],
tableLoading1: false,
column1: [
+ {
+ label: 'IFS鍩�',
+ prop: 'contract',
+ width: '120px',
+ dataType: 'tag',
+ formatData: (params) => {
+ return params
+ },
+ formatType: (params) => {
+ if (params === 'ZTNS') {
+ return ''
+ } else if (params === 'KJNS') {
+ return 'success'
+ }else {
+ return null
+ }
+ }
+
+ },
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
{
label: '濮旀墭缂栧彿',
@@ -315,36 +358,6 @@
{ 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
- }
- },
- {
- 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: '鐗╂枡灞炴��',
prop: 'materialProp',
@@ -421,6 +434,25 @@
tableData2: [],
tableLoading2: false,
column2: [
+ {
+ label: 'IFS鍩�',
+ prop: 'contract',
+ width: '120px',
+ dataType: 'tag',
+ formatData: (params) => {
+ return params
+ },
+ formatType: (params) => {
+ if (params === 'ZTNS') {
+ return ''
+ } else if (params === 'KJNS') {
+ return 'success'
+ }else {
+ return null
+ }
+ }
+
+ },
{
label: '濮旀墭缂栧彿',
prop: 'entrustCode',
@@ -594,6 +626,25 @@
tableData3: [],
tableLoading3: false,
column3: [
+ {
+ label: 'IFS鍩�',
+ prop: 'contract',
+ width: '120px',
+ dataType: 'tag',
+ formatData: (params) => {
+ return params
+ },
+ formatType: (params) => {
+ if (params === 'ZTNS') {
+ return ''
+ } else if (params === 'KJNS') {
+ return 'success'
+ }else {
+ return null
+ }
+ }
+
+ },
{ label: '濮旀墭缂栧彿', prop: 'entrustCode', width: "160px", },
{
dataType: 'tag',
@@ -682,21 +733,6 @@
}
},
{
- 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',
@@ -746,6 +782,7 @@
current: 1
},
entity: {
+ contract: null,
updateBatchNo: null,
entrustCode: null,
partDesc: null,
@@ -1009,7 +1046,7 @@
type: 'success',
message: '鏀捐鎴愬姛!'
});
- this.refresh()
+ this.refreshTable()
}
})
}).catch(() => {
@@ -1148,7 +1185,7 @@
if (res.code === 200) {
this.exemptionVisible = false
this.$message.success('鎿嶄綔鎴愬姛')
- this.refresh()
+ this.refreshTable()
}
this.exemptionLoading = false
}).catch(err => {
--
Gitblit v1.9.3