From 8bd549c42f20faeedd0f2f1264e2f5003f2db3db Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 21 三月 2025 13:15:08 +0800
Subject: [PATCH] 下载更改

---
 src/views/business/rawMaterialInspection/index.vue |   48 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index 7b6f9e8..c4631d8 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>
@@ -141,11 +141,6 @@
             <el-option :value="1" label="杩囨湡鐗╂枡"></el-option>
           </el-select>
         </el-form-item>
-        <!-- TODO:蹇呭~ -->
-        <el-form-item class="declareObj-form-item" label="渚涘簲鍟嗘壒鍙�:" prop="buyUnitMeas">
-          <el-input v-model="declareObj.buyUnitMeas" :disabled="declareType !== 'add'" clearable class="addObj-info"
-            size="small"></el-input>
-        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-row>
@@ -166,8 +161,8 @@
     </el-dialog>
     <!-- 鎾ら攢鎶ユ -->
     <el-dialog :visible.sync="declareDialogVisible1" title="鎶ユ鎾ら攢" width="30%">
-      <p style="font-size:16px;color:#333333">鎵瑰彿<span style="color:#34BD66">{{ insOrderRow.updateBatchNo
-          }}</span>鐨勪俊鎭槸鍚�<span style="color: #FF4902">鎾ら攢鎶ユ</span></p>
+      <p style="font-size:16px;color:#333333">鎵瑰彿<span
+          style="color:#34BD66">{{ insOrderRow.updateBatchNo }}</span>鐨勪俊鎭槸鍚�<span style="color: #FF4902">鎾ら攢鎶ユ</span></p>
       <span slot="footer" class="dialog-footer">
         <el-row>
           <el-button @click="declareDialogVisible1 = false">鍙� 娑�</el-button>
@@ -307,13 +302,12 @@
       ],
       page: {
         total: 0,
-        size: 10,
+        size: 20,
         current: 1
       },
       tableData1: [],
       tableLoading1: false,
       column1: [
-        { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: '160px' },
         {
           dataType: 'tag',
           label: '妫�楠岀姸鎬�',
@@ -351,13 +345,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' },
@@ -382,7 +395,7 @@
         },
         { label: '鍗曚綅', prop: 'buyUnitMeas' },
         { label: '鎺ユ敹鏃堕棿', prop: 'receiverDate' },
-        { label: '鎶ユ鏃堕棿', prop: 'declareDate' },
+        { label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
         {
           dataType: 'action',
           fixed: 'right',
@@ -429,7 +442,7 @@
       ],
       page1: {
         total: 0,
-        size: 10,
+        size: 20,
         current: 1
       },
       more: false,
@@ -566,7 +579,7 @@
     // 宸插畬鎴愰儴鏌ヨ
     getIfsByFinishList() {
       this.tableLoading1 = true
-      if (null != this.componentData.date) {
+      if(null != this.componentData.date){
         this.componentData.beginDeclareDate = this.componentData.date[0]
         this.componentData.endDeclareDate = this.componentData.date[1]
       } else {
@@ -586,7 +599,7 @@
     // 鍏ㄩ儴鏌ヨ
     getIfsByAllList() {
       this.tableLoading1 = true
-      if (null != this.componentData.date) {
+      if(null != this.componentData.date){
         this.componentData.beginDeclareDate = this.componentData.date[0]
         this.componentData.endDeclareDate = this.componentData.date[1]
       } else {
@@ -798,6 +811,7 @@
     openIFS() {
       this.btnLoading = true
       getIfsOrder().then(res => {
+        this.resetForm('componentData')
         this.refreshTable()
         this.btnLoading = false
       }).catch(err => {

--
Gitblit v1.9.3