From f9d1ac78b245cb672342e96cf0e905b812352651 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 21 三月 2025 11:23:24 +0800
Subject: [PATCH] 原材料下单-检验标准未回显

---
 src/views/business/rawMaterialInspection/index.vue |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index caf2741..c562ab8 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -25,8 +25,8 @@
           <el-form-item>
             <el-button v-if="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" icon="el-icon-search" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
-            <el-button size="mini" @click="refresh()" icon="el-icon-refresh">閲� 缃�</el-button>
+            <el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
+            <el-button size="mini" @click="refresh()" >閲嶇疆</el-button>
           </el-form-item>
         </el-row>
         <el-row>
@@ -265,6 +265,7 @@
         { label: '鎶ユ鏃堕棿', prop: 'declareDate' },
         {
           dataType: 'action',
+          fixed: 'right',
           label: '鎿嶄綔',
           operation: [
             {
@@ -308,7 +309,6 @@
       tableData1: [],
       tableLoading1: false,
       column1: [
-        { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: '160px' },
         {
           dataType: 'tag',
           label: '妫�楠岀姸鎬�',
@@ -346,13 +346,32 @@
         },
         { label: '璁㈠崟鍙�', prop: 'orderNo' },
         { label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived' },
-        { label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
+        { label: '鎶ユ鏃堕棿', prop: 'declareDate' },
         { label: '鎵瑰彿', prop: 'updateBatchNo' },
         { label: '闆朵欢鍙�', prop: 'partNo' },
         { label: '闆朵欢鎻忚堪', prop: 'partDesc' },
         { label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName' },
         { label: '涓嶅悎鏍兼弿杩�', prop: 'unqualifiedDesc' },
-        { label: '鍏嶆', prop: 'isExemption' },
+        {
+          dataType: 'tag',
+          label: '鍏嶆',
+          prop: 'isExemption',
+          formatData: (params) => {
+            if (params == 1) {
+              return '鍏嶆'
+            } else {
+              return null
+            }
+          },
+          formatType: (params) => {
+            if (params == 1) {
+              return 'success'
+            } else {
+              return null
+            }
+          }
+        },
+        { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: '160px' },
         { label: '鏍峰搧鍚嶇О', prop: 'sampleName' },
         { label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
         { label: '妫�楠屼汉', prop: 'userName' },
@@ -377,7 +396,7 @@
         },
         { label: '鍗曚綅', prop: 'buyUnitMeas' },
         { label: '鎺ユ敹鏃堕棿', prop: 'receiverDate' },
-        { label: '鎶ユ鏃堕棿', prop: 'declareDate' },
+        { label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
         {
           dataType: 'action',
           fixed: 'right',
@@ -793,6 +812,7 @@
     openIFS() {
       this.btnLoading = true
       getIfsOrder().then(res => {
+        this.resetForm('componentData')
         this.refreshTable()
         this.btnLoading = false
       }).catch(err => {

--
Gitblit v1.9.3