改bug

src/views/inspectionWork/components/newQualityContentTabs.vue

@@ -465,6 +465,12 @@
           // console.log(newVal, 'schemeList');
         },
         deep: true
+      },
+      activeName: {
+        handler(newVal) {
+          this.activeNameKK=newVal
+          // console.log(newVal);
+        }
       }
     },
     props: {
@@ -966,6 +972,8 @@
         this.$refs.inspectionTemplateRef.open(2);
       },
       async inspectionTemplateSuccess(select) {
+        console.log(select);
+
         let data = await getQualityTemplateByIds({
           templateIds: select.map((item) => item.id)
         });
@@ -976,15 +984,17 @@
         // const removeDupList = [...new Set(strings)];
         // const result = removeDupList.map((item) => JSON.parse(item));
 
-        this.templateList=[]
-        this.templateList.push(...data)
-
-        
-        this.templateList = result.map((item) => {
+        this.templateList = [];
+        this.templateList.push(...data);
+        this.templateList.forEach((item) => {
           item['qualityResults'] = 1;
-          return item;
         });
 
+        // this.templateList = result.map((item) => {
+        //   item['qualityResults'] = 1;
+        //   return item;
+        // });
+
         this.sampleList.forEach((item, index) => {
           this.$set(
             this.sampleList[index],

src/views/inspectionWork/components/toolList.vue

@@ -159,6 +159,7 @@ export default {
                 // },
             ],
             data: [],
+            type:''
         }
     },
     methods: {

src/views/inspectionWork/edit.vue

@@ -291,6 +291,9 @@
       // 创建计量数量为1的样品清单函数，用于计数类型的
       async createSampleList(list) {
         if (this.form.qualityMode != null) {
+          console.log('sssssjijdiajdia');
+
+          this.$message('正在生成样品清单');
           const ProductSampleList = [];
           console.log(list, 'list');
           for (const oldItem of list) {
@@ -398,6 +401,7 @@
       },
       // 切换检验方式为全检后生成样品
       changeGetSampleList(list) {
+        this.$message('正在生成样品清单');
         console.log(list);
         console.log(this.form.total);
 
@@ -911,7 +915,6 @@
           delete this.form['qualityTimeEnd'];
 
           console.log(this.sampleList);
-         
 
           let params = {
             ...this.form,
@@ -922,7 +925,7 @@
             qualityInventoryList: this.inventoryList
           };
           console.log(params, 'params ----');
-        
+
           URL(params)
             .then((msg) => {
               this.loading = false;

src/views/sample/samplemanagement/index.vue

@@ -48,6 +48,7 @@
             :underline="false"
             icon="el-icon-edit"
             @click="openEdit('edit', row)"
+            v-if="row.status !== 2"
           >
             修改
           </el-link>
@@ -63,6 +64,7 @@
             class="ele-action"
             title="确定要删除吗？"
             @confirm="remove(row)"
+            v-if="row.status !== 2"
           >
             <template v-slot:reference>
               <el-link type="danger" :underline="false" icon="el-icon-delete">
@@ -183,7 +185,7 @@
             width: 80,
             formatter: (row, column, cellValue) => {
               console.log(this.getDictName('处置状态', cellValue));
-              
+
               return this.getDictName('处置状态', cellValue);
             }
           },

src/views/unqualifiedProduct/unqualifiedList/rework/index.vue

@@ -10,7 +10,7 @@
         :selection.sync="selection"
       >
         <!-- 操作列 -->
-        <!-- <template v-slot:toolbar>
+        <template v-slot:toolbar>
           <el-button
             type="primary"
             slot="reference"
@@ -18,7 +18,7 @@
             @click="open(1)"
             >转生产计划</el-button
           >
-          <el-button
+          <!-- <el-button
             type="primary"
             slot="reference"
             :disabled="selection.length == 0"
@@ -43,8 +43,8 @@
                 >批量删除</el-button
               >
             </template>
-          </el-popconfirm>
-        </template> -->
+          </el-popconfirm> -->
+        </template>
         <template v-slot:action="{ row }">
           <el-popconfirm
             class="ele-action"