From 79c983e7fa924e43f9f2a2a11b6f69c546f051a6 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 10 四月 2025 13:06:50 +0800
Subject: [PATCH] 不合格复测

---
 src/views/business/inspectionTask/components/InspectionWord.vue |   30 +++++++++++++-----------------
 1 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index abe220c..c29c3f4 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -33,16 +33,16 @@
             <tbody>
               <tr v-for="(m, i) in item.arr" :key="i">
                 <td v-for="(n, j) in m" v-if="n.v.mc == undefined || Object.keys(n.v.mc).length === 4"
-                  :id='item.templateId + "-" + n.i + "-" + n.r + "-" + n.c' :key="j" :colspan="n.v.mc && n.v.mc.cs ? n.v.mc.cs : 1"
-                  :rowspan="n.v.mc && n.v.mc.rs ? n.v.mc.rs : 1"
+                  :id='item.templateId + "-" + n.i + "-" + n.r + "-" + n.c' :key="j"
+                  :colspan="n.v.mc && n.v.mc.cs ? n.v.mc.cs : 1" :rowspan="n.v.mc && n.v.mc.rs ? n.v.mc.rs : 1"
                   :style="`background:${n.v.bg ? n.v.bg : ''};color:${n.v.fc};font-size:${n.v.fs}px;width:${handleWidth(n)}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl ? 'bold' : ''};`">
                   <div :class="`content-h-${n.v.ht} content-v-${n.v.vt}`"
                     :style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;`"
                     class="content">
                     <template
                       v-if="n.v.ps != undefined && typeof n.v.ps.value === 'string' && n.v.ps.value.includes('妫�楠屽��') && state == 1">
-                      <el-input v-if="getInspectionValueType(n.i) == 1" :key="'abc-' + '000' + index + '000' + i + '000' + j"
-                        v-model="n.v.v"
+                      <el-input v-if="getInspectionValueType(n.i) == 1"
+                        :key="'abc-' + '000' + index + '000' + i + '000' + j" v-model="n.v.v"
                         :disabled="(getInspectionItemType(n.i) == 1 && !dataAcquisitionEidtAble) || (n.u != userId && n.u != undefined && n.u != '')"
                         class="table_input"
                         @change="m => changeInput(m, `${item.templateId}-${n.r}-${n.c}-${n.i}`, n, 'getDataType')"
@@ -125,7 +125,8 @@
                     </template>
                     <template v-else-if="n.v.ps != undefined && n.v.ps.value === '濂楃'">
                       <div style="display: flex;flex-wrap: nowrap;align-items: center;">
-                        <div :style="`font-family:${n.v.ff} !important;`">{{ currentBushing ? currentBushing.color : '' }}
+                        <div :style="`font-family:${n.v.ff} !important;`">{{ currentBushing ? currentBushing.color : ''
+                          }}
                         </div>
                       </div>
                     </template>
@@ -240,19 +241,18 @@
 </template>
 
 <script>
-// import ValueTable from '../../tool/value-table.vue'
-import file from '@/utils/file'
 import excelFunction from '@/utils/excelFountion'
 import UnPassDialog from "@/views/business/unpass/components/unPassDialog.vue";
 import AddUnPass from "@/views/business/unpass/components/addUnPass.vue";
 import {
   checkSubmitPlan,
+  determineWhetherToCollectData,
   doInsOrder, downFile,
   getInsProductUnqualifiedRetest,
   search, selectUserCondition,
   submitPlan,
   verifyPlan
-} from "@/api/business/inspectionTask";
+} from '@/api/business/inspectionTask'
 import { getUserNow, saveUnqualifiedContext } from "@/api/business/rawMaterialOrder";
 export default {
   props: ['sonLaboratory', 'orderId', 'state', 'inspectorList', 'typeSource', 'unPassCheck', 'rawMaterialTag'],
@@ -848,7 +848,7 @@
         retestTag: this.retestTag,
         rawMaterialTag: this.rawMaterialTag,
       }
-      let res = getInsProductUnqualifiedRetest(params)
+      let res = await getInsProductUnqualifiedRetest(params)
       if (res.code === 200 && res.data.length > 0) {
         this.tableLoading = false;
         this.scrollInit()
@@ -1282,7 +1282,7 @@
           }
         })
         // 浠ヤ笅鏄牱寮忓鐞嗛�昏緫
-        set = Array.sort(set)
+        // set = Array.sort(set)
         set.forEach(b => {
           let arr = []
           a.template.forEach(c => {
@@ -1848,10 +1848,6 @@
             currentTable: this.currentTable,
             sampleId: this.currentSample.id
           }).then(res => {
-            if (res.code == 201) {
-              this.$message.error('淇濆瓨澶辫触')
-              return
-            }
             this.$message.success('宸蹭繚瀛�')
           })
           // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
@@ -1924,7 +1920,7 @@
       }
     },
     getAuthorizedPerson() {
-      selectUserCondition({ type: 0 }).then((res) => {
+      selectUserCondition({ type: 1 }).then((res) => {
         let data = [];
         res.data.forEach((a) => {
           data.push({
@@ -2036,7 +2032,7 @@
       downFile({
         id: row.id,
       }).then(res => {
-        this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName);
+        this.$download.saveAs(res.data.fileUrl, row.fileName);
       }).catch(error => {
 
       })
@@ -2194,7 +2190,7 @@
 }
 
 .content-h-2 {
-  justify-content: end;
+  justify-content: flex-end;
 }
 
 .content-v-0 {

--
Gitblit v1.9.3