From d867b7e7a0aa87d279da044b621e5ba54e746d8a Mon Sep 17 00:00:00 2001
From: yedejiamingshi <540057894@qq.com>
Date: Fri, 14 Feb 2025 15:42:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5=2002.14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/production/harvestInfo/index.vue | 33 ++++------------------
 src/views/production/inspection/index.vue  | 11 ++++++--
 2 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/src/views/production/harvestInfo/index.vue b/src/views/production/harvestInfo/index.vue
index f5648e6..b423c0e 100644
--- a/src/views/production/harvestInfo/index.vue
+++ b/src/views/production/harvestInfo/index.vue
@@ -44,7 +44,7 @@
             </el-tooltip>
           </template>
         </el-table-column>
-        <!-- 
+        <!--
         <el-table-column label="状态" align="center" prop="blockState" width="230" >
           <template slot-scope="{row}">
             <div class="table-column">
@@ -66,14 +66,6 @@
                        v-hasPermi="['product:harvest-info:delete']">复制</el-button>
             <el-button size="mini" type="text" @click="handleDelete(row)"
                        v-hasPermi="['product:harvest-info:delete']">删除</el-button>
-                       <!-- 
-            <el-button v-if="row.blockState == 0" size="mini" type="text" @click="handleState(row,'upChain')"
-                       v-hasPermi="['product:harvest-info:delete']">上传</el-button>
-            <el-button v-if="row.blockState == 1" size="mini" type="text" @click="handleState(row,'freeze')"
-                       v-hasPermi="['product:harvest-info:delete']">冻结</el-button>
-            <el-button v-if="row.blockState == 2" size="mini" type="text" @click="handleState(row,'active')"
-                       v-hasPermi="['product:harvest-info:delete']">激活</el-button>
-                       -->
           </template>
         </el-table-column>
         <div slot="empty">
@@ -585,25 +577,10 @@ export default {
       }
     },
 
-    handleDeleteGoods(index,row){
-      let id = this.form.id;
-      if( id ){
-        let ids = row.id;
-        deleteHarvestBatchs({
-          ids,
-        }).then((res)=>{
-          console.log('删除成功');
-          let i;
-          this.inputCheckedIdList.map((item,index)=>{
-            if(item == row.goodsId) i=index;
-          });
-          this.inputsList.splice(i,1)
-          this.inputCheckedIdList.splice(i,1)
-          this.form.harvestBatchs.splice(index,1)
-        });
-      }else{
-        this.form.harvestBatchs.splice(index,1)
-      }
+    handleDeleteGoods(index, row) {
+      this.inputsList.splice(index, 1);
+      this.inputCheckedIdList.splice(index, 1);
+      this.form.harvestBatchs.splice(index, 1);
     },
 
     changeBusiness(){
diff --git a/src/views/production/inspection/index.vue b/src/views/production/inspection/index.vue
index a931852..5766141 100644
--- a/src/views/production/inspection/index.vue
+++ b/src/views/production/inspection/index.vue
@@ -60,7 +60,7 @@
             <span>{{parseTime(row.createTime)}}</span>
           </template>
         </el-table-column>
-        <!-- 
+        <!--
         <el-table-column label="上传状态" align="center" prop="blockState" >
           <template v-slot="{ row }">
             <el-tag
@@ -680,8 +680,13 @@ export default {
         }).catch(() => {});
     },
     // 模板确认导入
-    importModel(){
-      this.form.inspectionItems = this.tempList[this.templateId].inspectionItems;
+    importModel() {
+      this.form.inspectionItems = this.tempList[this.templateId].inspectionItems.map(item => {
+        return {
+          ...item,
+          id: null,
+        }
+      });
     },
     // 当前选择保存为模板
     saveModel(){