From 004dd76166e198d6f463ce68149e2dee9c77348d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E7=82=BC?= <992116259@qq.com>
Date: Mon, 25 Nov 2024 17:15:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=8C=91=E9=80=89=E4=B8=8D=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/qms/inspec/content/inspec-process.vue | 744 ++++++++----------
 1 file changed, 332 insertions(+), 412 deletions(-)

diff --git a/src/views/mes/qms/inspec/content/inspec-process.vue b/src/views/mes/qms/inspec/content/inspec-process.vue
index fa92b5f..bae0a64 100644
--- a/src/views/mes/qms/inspec/content/inspec-process.vue
+++ b/src/views/mes/qms/inspec/content/inspec-process.vue
@@ -1,202 +1,133 @@
 <template>
   <div class="execution">
-    <el-dialog
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-el-drag-dialog
-      :fullscreen="false"
-      width="90%"
-      :visible.sync="formVisible"
-      title="过程检验"
-      @close="closeForm"
-      center
-      top="100px"
-    >
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-el-drag-dialog :fullscreen="false"
+      width="90%" :visible.sync="formVisible" title="过程检验" @close="closeForm" center top="100px">
       <div class="execution">
-        <el-dialog
-          width="70%"
-          :append-to-body="true"
-          :close-on-click-modal="false"
-          :close-on-press-escape="false"
-          v-el-drag-dialog
-          :fullscreen="false"
-          :visible.sync="ncCodeDialogVisible"
-          :ncCodeList ="ncCodeList"
-          :inspecNcList = "inspecNcList"
-          title="挑选不合格代码"
-          :state="state"
-          row-key="handle"
-          center
-          @close="ncCodeFormClose"
-        >
-			<div class="execution">
-				<el-form class="form" ref="ncCodeForm" :model="ncCodeForm" label-width="120px">
-					<el-row>
-            <el-col :span="6">
-              <el-form-item label="物料" prop="item">
-                <el-input
-                  v-model.trim="ncCodeForm.item"
-                  :disabled="true"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <span>{{ncCodeForm.itemDesc}}</span>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="发生工序" prop="operation">
-                <el-input
-                  v-model.trim="ncCodeForm.operation"
-                  :disabled="true"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <span>{{ncCodeForm.operationDesc}}</span>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item label="发生设备" prop="resrce">
-                <el-input
-                  v-model.trim="ncCodeForm.resrce"
-                  :disabled="true"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <span>{{ncCodeForm.resrceDesc}}</span>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="生产批/条码" prop="lotNo">
-                <el-input
-                  v-model.trim="ncCodeForm.lotNo"
-                  :disabled="true"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="检验项目" prop="qcItemDesc">
-                <span>{{ncCodeForm.qcItemDesc}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-table
-                  @selection-change="handleSelectionChange"
-                  :data="ncCodeList" border
-                  ref="multipleSelection"
-              >
-                <el-table-column
-                  type="selection"
-                  v-if="state !== 'view'"
-                />
-                <el-table-column prop="handle" v-if="false">
-                </el-table-column>
-                <el-table-column
-                  prop="ncCode"
-                  label="不合格代码"
-                >
-                </el-table-column>
-                <el-table-column
-                  prop="ncCodeDesc"
-                  label="不合格代码描述"
-                >
-                </el-table-column>
-              </el-table>
-            </el-col>
-            <el-col :span="12">
-              <el-table
-                  :data="inspecNcList" border
-              >
-              <el-table-column prop="ncCodeDesc" label="描述">
-              </el-table-column>
-              <el-table-column prop="ncQty" label="不合格数量">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.ncQty" type="number" min="0" />
-                </template>
-              </el-table-column>
-              <!--     备注           -->
-              <el-table-column prop="ncDesc" label="不合格备注">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.ncDesc"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作">
-                <template slot-scope="scope">
-                  <el-button
-                    type="danger"
-                    icon="el-icon-delete"
-                    size="mini"
-                    :disabled = "state === 'view'"
-                    @click="deleteInspecNc(scope.$index, scope.row)"
-                  >
-                    删除
-                  </el-button>
-                </template>
-              </el-table-column>
-              </el-table>
-            </el-col>
-          </el-row>
-				</el-form>
-			</div>
-			<div style="width: 100%; display: flex; justify-content: center; margin-top: 20px">
-				<span slot="footer" class="dialog-footer">
-					<el-button
-						type="primary"
-						icon="el-icon-circle-plus-outline"
-						size="small"
-            :disabled="state === 'view'"
-						@click="saveNcList()"
-						>保存
-					</el-button>
-				</span>
-			</div>
-		</el-dialog>
-      <el-dialog
-        width="70%"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-el-drag-dialog
-        :fullscreen="false"
-        :visible.sync="photosVisible"
-        title="预览"
-        :state="state"
-        row-key="handle"
-        center
-      >
-        <div class="demo-image__lazy">
-          <div v-for="urlObj in urls">
-            <el-image :src="urlObj.url" lazy></el-image>
+        <el-dialog width="70%" :append-to-body="true" :close-on-click-modal="false" :close-on-press-escape="false"
+          v-el-drag-dialog :fullscreen="false" :visible.sync="ncCodeDialogVisible" :ncCodeList="ncCodeList"
+          :inspecNcList="inspecNcList" title="挑选不合格代码" :state="state" row-key="handle" center @close="ncCodeFormClose">
+          <div class="execution">
+            <el-form class="form" ref="ncCodeForm" :model="ncCodeForm" label-width="120px">
+              <el-row>
+                <el-col :span="6">
+                  <el-form-item label="物料" prop="item">
+                    <el-input v-model.trim="ncCodeForm.item" :disabled="true">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <span>{{ ncCodeForm.itemDesc }}</span>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="发生工序" prop="operation">
+                    <el-input v-model.trim="ncCodeForm.operation" :disabled="true">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <span>{{ ncCodeForm.operationDesc }}</span>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="6">
+                  <el-form-item label="发生设备" prop="resrce">
+                    <el-input v-model.trim="ncCodeForm.resrce" :disabled="true">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4">
+                  <span>{{ ncCodeForm.resrceDesc }}</span>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="生产批/条码" prop="lotNo">
+                    <el-input v-model.trim="ncCodeForm.lotNo" :disabled="true">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="检验项目" prop="qcItemDesc">
+                    <span>{{ ncCodeForm.qcItemDesc }}</span>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-table class="my-custom-table" @selection-change="handleSelectionChange" :data="ncCodeList" border
+                    ref="multipleSelection">
+                    <el-table-column type="selection" v-if="state !== 'view'" />
+                    <el-table-column prop="handle" v-if="false">
+                    </el-table-column>
+                    <el-table-column prop="ncCode" label="不合格代码">
+                    </el-table-column>
+                    <el-table-column prop="ncCodeDesc" label="不合格代码描述">
+                    </el-table-column>
+                  </el-table>
+                </el-col>
+                <el-col :span="12">
+                  <el-table class="my-custom-table" :data="inspecNcList" border>
+                    <el-table-column prop="ncCodeDesc" label="描述">
+                    </el-table-column>
+                    <el-table-column prop="ncQty" label="不合格数量">
+                      <template slot-scope="scope">
+                        <el-input v-model="scope.row.ncQty" type="number" min="0" />
+                      </template>
+                    </el-table-column>
+                    <!--     备注           -->
+                    <el-table-column prop="ncDesc" label="不合格备注">
+                      <template slot-scope="scope">
+                        <el-input v-model="scope.row.ncDesc" />
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="操作">
+                      <template slot-scope="scope">
+                        <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="state === 'view'"
+                          @click="deleteInspecNc(scope.$index, scope.row)">
+                          删除
+                        </el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-col>
+              </el-row>
+            </el-form>
           </div>
-        </div>
-      </el-dialog>
+          <div style="width: 100%; display: flex; justify-content: center; margin-top: 20px">
+            <span slot="footer" class="dialog-footer">
+              <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" :disabled="state === 'view'"
+                @click="saveNcList()">保存
+              </el-button>
+            </span>
+          </div>
+        </el-dialog>
+        <el-dialog width="70%" :append-to-body="true" :close-on-click-modal="false" :close-on-press-escape="false"
+          v-el-drag-dialog :fullscreen="false" :visible.sync="photosVisible" title="预览" :state="state" row-key="handle"
+          center>
+          <div class="demo-image__lazy">
+            <div v-for="(urlObj, index) in urls" :key=index>
+              <el-image :src="urlObj.url" lazy></el-image>
+            </div>
+          </div>
+        </el-dialog>
         <el-form class="form" ref="processForm" :model="processForm" label-width="120px">
           <el-row>
             <el-col :span="8">
               <el-form-item label="工厂:" prop="site">
-                <span>{{processForm.site}}</span>
+                <span>{{ processForm.site }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="检验任务单号:" prop="jobNo">
-                <span>{{processForm.jobNo}}</span>
+                <span>{{ processForm.jobNo }}</span>
               </el-form-item>
             </el-col>
             <el-col v-if="false">
               <el-form-item label="产品:" prop="item">
-                <span>{{processForm.item}}</span>
+                <span>{{ processForm.item }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="产品名称:" prop="itemDesc">
-                <span>{{processForm.itemDesc}}</span>
+                <span>{{ processForm.itemDesc }}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -208,64 +139,58 @@
             </el-col>
             <el-col v-if="false">
               <el-form-item label="工序" prop="operation">
-                <span>{{processForm.operation}}</span>
+                <span>{{ processForm.operation }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="工序名称:" prop="operationDesc">
-                <span>{{processForm.operationDesc}}</span>
+                <span>{{ processForm.operationDesc }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="总体判定结果:" prop="item">
-                <el-select v-model="processForm.result" :disabled = "state === 'view'">
-                  <el-option v-for="item in resultList" :key="item.inspectionLevel" :label="item.inspectionLevelDesc" :value="item.inspectionLevel"/>
-                  </el-select>
+                <el-select v-model="processForm.result" :disabled="state === 'view'">
+                  <el-option v-for="item in resultList" :key="item.inspectionLevel" :label="item.inspectionLevelDesc"
+                    :value="item.inspectionLevel" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <el-form-item label="工单:" prop="shopOrder">
-                <span>{{processForm.shopOrder}}</span>
+                <span>{{ processForm.shopOrder }}</span>
               </el-form-item>
             </el-col>
             <el-col v-if="false">
               <el-form-item label="设备:" prop="resrce">
-                <span>{{processForm.resrce}}</span>
+                <span>{{ processForm.resrce }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="设备名称:" prop="resrceDesc">
-                <span>{{processForm.resrceDesc}}</span>
+                <span>{{ processForm.resrceDesc }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="物性检验结果:" prop="physicsResult">
-                <span>{{processForm.physicsResult}}</span>
+                <span>{{ processForm.physicsResult }}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <el-form-item label="检验细类:" prop="qcSubCategories">
-                <el-select
-                  v-model="processForm.qcSubCategories"
-                  :disabled="true"
-                >
-                  <el-option
-                    v-for="item in qcSubCategoriesList"
-                    :key="item.value"
-                    :label="$t(item.label)"
-                    :value="item.value"
-                  >
+                <el-select v-model="processForm.qcSubCategories" :disabled="true">
+                  <el-option v-for="item in qcSubCategoriesList" :key="item.value" :label="$t(item.label)"
+                    :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="工作中心:" prop="workCenter">
-                <span>{{processForm.workCenter}}</span>
+                <span>{{ processForm.workCenter }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -274,29 +199,20 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row >
-             <el-button type="primary" @click="processFormSave()" :disabled="state === 'view'">保存</el-button>
-             <el-button type="primary" @click="submit()" :disabled="state === 'view'">提交</el-button>
-             <el-button type="primary" @click="openNc()" :disabled="state === 'view'">记录不良</el-button>
-             <el-button type="primary" @click="returnCheck()" :disabled="state === 'view'">重检</el-button>
+          <el-row>
+            <el-button type="primary" @click="processFormSave()" :disabled="state === 'view'">保存</el-button>
+            <el-button type="primary" @click="submit()" :disabled="state === 'view'">提交</el-button>
+            <el-button type="primary" @click="openNc()" :disabled="state === 'view'">记录不良</el-button>
+            <el-button type="primary" @click="returnCheck()" :disabled="state === 'view'">重检</el-button>
             <el-button type="primary" @click="doSearch()" :disabled="state === 'view'">检索</el-button>
           </el-row>
         </el-form>
         <div class="execution basic-container ">
-          <el-table
-            ref="qcTable"
-            :data="qcTable"
-            border
-            header-cell-class-name="table-header-gray"
-            :header-cell-style="{ 'text-align': 'center' }"
-            :cell-style="{ 'text-align': 'center' }"
-            width="100%"
-            height="250"
-            row-key="handle"
-            :tree-props="{ children: 'inspecResultList', hasChildren: 'hasinspecResultList' }"
-            default-expand-all
-            >
-            <el-table-column prop="seq" label="序号"/>
+          <el-table ref="qcTable" :data="qcTable" border header-cell-class-name="table-header-gray"
+            :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }" width="100%"
+            height="250" row-key="handle"
+            :tree-props="{ children: 'inspecResultList', hasChildren: 'hasinspecResultList' }" default-expand-all>
+            <el-table-column prop="seq" label="序号" />
             <el-table-column prop="qcItemDesc" label="检验项目名称">
             </el-table-column>
             <el-table-column prop="inspInstructions" label="检验说明">
@@ -305,31 +221,18 @@
             </el-table-column>
             <el-table-column prop="result" label="测试结果" width="150">
               <template slot-scope="scope">
-                  <el-input
-                          :disabled="state === 'view'"
-                          v-if="scope.row.inputNum"
-                          ref="inputNum"
-                          v-model="scope.row.result"
-                          @input="numInputChange($event, scope.$index, scope.row)"
-                          @keyup.enter.native="inputEnter(scope.$index)"
-                          clearable/>
-                  <el-select v-model="scope.row.result" v-if="scope.row.selectBox" ref="selectBox" :disabled="state === 'view'">
-                    <el-option
-                      v-for="item in scope.row.qcItemTypeTextSubDetailList"
-                      :key="item.textNo"
-                      :label="item.textNoDesc"
-                      :value="item.textNo"
-                      @click.native="selectChange(item,scope.row)"
-                      >
-                    </el-option>
-                  </el-select>
-                <el-input v-if="scope.row.inputText" :disabled="state === 'view'"
-                          ref="inputText"
-                          v-model="scope.row.result"
-                          placeholder="请输入测试结果" clearable/>
-                <span
-                    ref="showResult"
-                    v-if="scope.row.showResult">{{scope.row.result}}</span>
+                <el-input :disabled="state === 'view'" v-if="scope.row.inputNum" ref="inputNum"
+                  v-model="scope.row.result" @input="numInputChange($event, scope.$index, scope.row)"
+                  @keyup.enter.native="inputEnter(scope.$index)" clearable />
+                <el-select v-model="scope.row.result" v-if="scope.row.selectBox" ref="selectBox"
+                  :disabled="state === 'view'">
+                  <el-option v-for="item in scope.row.qcItemTypeTextSubDetailList" :key="item.textNo"
+                    :label="item.textNoDesc" :value="item.textNo" @click.native="selectChange(item, scope.row)">
+                  </el-option>
+                </el-select>
+                <el-input v-if="scope.row.inputText" :disabled="state === 'view'" ref="inputText"
+                  v-model="scope.row.result" placeholder="请输入测试结果" clearable />
+                <span ref="showResult" v-if="scope.row.showResult">{{ scope.row.result }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="minValue" label="规格下限">
@@ -338,50 +241,41 @@
             </el-table-column>
             <el-table-column prop="ncCode" label="不良代码">
               <template slot-scope="scope">
-                <el-input v-if="scope.row.showNcCode" v-model="scope.row.ncCode" placeholder="请输入不良代码" :disabled="state === 'view'">
-                  <i
-                    slot="suffix"
-                    class="el-input__icon el-icon-copy-document"
-                    @click.stop="showDialog(scope.row)"
-                  ></i>
+                <el-input v-if="scope.row.showNcCode" v-model="scope.row.ncCode" placeholder="请输入不良代码"
+                  :disabled="state === 'view'">
+                  <i slot="suffix" class="el-input__icon el-icon-copy-document" @click.stop="showDialog(scope.row)"></i>
                 </el-input>
               </template>
             </el-table-column>
             <el-table-column prop="qcItemJudge" label="判定结果" width="150">
               <template slot-scope="scope">
-                <div :class="scope.row.qcItemJudge ? 'ok-cell' : 'ng-cell'" >
-                  <el-switch
-                      :disabled="state === 'view'"
-                    v-model="scope.row.qcItemJudge"
-                    active-text="OK"
-                    inactive-text="NG"
-                    @change="switchChange($event, scope.row)"
-                  />
+                <div :class="scope.row.qcItemJudge ? 'ok-cell' : 'ng-cell'">
+                  <el-switch :disabled="state === 'view'" v-model="scope.row.qcItemJudge" active-text="OK"
+                    inactive-text="NG" @change="switchChange($event, scope.row)" />
                 </div>
               </template>
             </el-table-column>
-            <el-table-column  label="图片上传" width="200">
-              <template slot-scope="scope" >
+            <el-table-column label="图片上传" width="200">
+              <template slot-scope="scope">
                 <el-row>
                   <el-col :span="12">
-                    <el-upload
-                    :action="qms('/inspec-attachment/uploadMinio')"
-                    :show-file-list="false"
-                    :on-success="uploadSuccess"
-                    :on-error="uploadError"
-                    :data="uploadData">
-                    <el-button size="small" type="primary" @click="uploadButton(scope.row)" :disabled="scope.row.showPhotosMust || state === 'view'">点击上传</el-button>
-                  </el-upload>
+                    <el-upload :action="qms('/inspec-attachment/uploadMinio')" :show-file-list="false"
+                      :on-success="uploadSuccess" :on-error="uploadError" :data="uploadData">
+                      <el-button size="small" type="primary" @click="uploadButton(scope.row)"
+                        :disabled="scope.row.showPhotosMust || state === 'view'">点击上传</el-button>
+                    </el-upload>
                   </el-col>
                   <el-col :span="12">
-                    <el-button size="small" type="primary" @click="showPhotos(scope.row)" :disabled="scope.row.showPhotosMust">查看图片</el-button>
+                    <el-button size="small" type="primary" @click="showPhotos(scope.row)"
+                      :disabled="scope.row.showPhotosMust">查看图片</el-button>
                   </el-col>
                 </el-row>
               </template>
             </el-table-column>
             <el-table-column label="操作">
               <template slot-scope="scope">
-                <el-button type="primary" @click="detailSave(scope.row,scope.index)" :disabled="scope.row.showSaveButton || state === 'view'">保存</el-button>
+                <el-button type="primary" @click="detailSave(scope.row, scope.index)"
+                  :disabled="scope.row.showSaveButton || state === 'view'">保存</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -396,11 +290,11 @@ import { hideLoading, showLoading } from '@/const/loading'
 import { numberControl } from '@/util/number'
 import { isBlank } from '@/util/string'
 import { getCurrentItem as getItemList } from '@/api/mes/prd/item'
-import { textGroupNoDialogObj, textGroupObj} from "@/views/mes/qms/qc-plan/init";
-import {addAndUpdateObj, fetchListPage as getTextGroupList,fetchDetailList as getTextGroupDetail} from '@/api/mes/qms-nalinv/qcItemTypeText'
-import {checkTableRepeat, setSeq} from "@/util/table";
-import {copyJSON} from "@/util/util";
-import {closeForm, processForm} from "@/views/mes/qms/inspec/content/inspec";
+import { textGroupNoDialogObj, textGroupObj } from "@/views/mes/qms/qc-plan/init";
+import { addAndUpdateObj, fetchListPage as getTextGroupList, fetchDetailList as getTextGroupDetail } from '@/api/mes/qms-nalinv/qcItemTypeText'
+import { checkTableRepeat, setSeq } from "@/util/table";
+import { copyJSON } from "@/util/util";
+import { closeForm, processForm } from "@/views/mes/qms/inspec/content/inspec";
 import {
   closeInspec, getMinio,
   getOneDetail, reInspec, saveAllInspecAndDetailResult,
@@ -410,10 +304,10 @@ import {
   selectLevel,
   submitInspec
 } from '@/api/mes/qms/inspec-job'
-import {getStore} from "@/util/store";
+import { getStore } from "@/util/store";
 import store from '@/store'
-import {qms} from "@/api/prefix";
-import {selectByOp} from "@/api/mes/prd/nc-group-member";
+import { qms } from "@/api/prefix";
+import { selectByOp } from "@/api/mes/prd/nc-group-member";
 
 export default {
   props: {
@@ -436,29 +330,29 @@ export default {
     return {
       qms,
       headers: {
-				Authorization: 'Bearer ' + store.getters.access_token,
-			},
+        Authorization: 'Bearer ' + store.getters.access_token,
+      },
       processForm: copyJSON(processForm),
       formVisible: false,
       fileList: [],
       resultList: [],
       qcTable: [],
-      qcItemTypeTextSubDetailList:[],
-      qcSubCategoriesList:[],
+      qcItemTypeTextSubDetailList: [],
+      qcSubCategoriesList: [],
       selectedRows: [],
-      multipleSelection:[],
-      ncCodeForm:{},
-      ncCodeList:[],
-      inspecNcList:[],
+      multipleSelection: [],
+      ncCodeForm: {},
+      ncCodeList: [],
+      inspecNcList: [],
       rowIndex: null, //記錄筆數
       textGroupNoDialogShow: false,
       textGroupNoDialogObj,
       getTextGroupList,
-      ncCodeDialogVisible:false,
+      ncCodeDialogVisible: false,
       photosVisible: false,
       uploadData: {
-        inspecJobBo:null,
-        inspecDetailBo:null,
+        inspecJobBo: null,
+        inspecDetailBo: null,
         creator: getStore({ name: 'userInfo' }).username
       },
       urls: []
@@ -491,7 +385,7 @@ export default {
     let me = this
     console.log("onLoad")
   },
-  computed:{
+  computed: {
   },
   methods: {
     //上传成功
@@ -526,7 +420,7 @@ export default {
       })
     },
     //提交
-    submit(){
+    submit() {
       let me = this
       if (isBlank(me.processForm.result)) {
         return me.$message.error('整体判定结果不能为空')
@@ -537,7 +431,7 @@ export default {
         for (let j = 0; j < t.inspecResultList.length; j++) {
           let d = t.inspecResultList[j]
           if (isBlank(d.result)) {
-            return me.$message.error('序号'+(i+1)+'测试结果不能为空')
+            return me.$message.error('序号' + (i + 1) + '测试结果不能为空')
           }
         }
       }
@@ -559,7 +453,7 @@ export default {
     close() {
       let me = this
       let param = {
-        handle : me.processForm.handle
+        handle: me.processForm.handle
       }
       this.$confirm('确定关闭', {
         confirmButtonText: this.$t('common.confirm'),
@@ -587,9 +481,9 @@ export default {
         confirmButtonText: this.$t('common.confirm'),
         cancelButtonText: this.$t('common.cancel'),
         type: 'warning',
-      }).then(() =>{
+      }).then(() => {
         let param = {
-          handle : me.processForm.handle
+          handle: me.processForm.handle
         }
         showLoading()
         reInspec(param).then(res => {
@@ -613,7 +507,7 @@ export default {
       me.showDialog(row)
     },
     //查看图片
-    showPhotos (row) {
+    showPhotos(row) {
       let me = this
       me.photosVisible = true
       me.urls = []
@@ -628,7 +522,7 @@ export default {
         let records = res.data.data
         for (let i = 0; i < records.length; i++) {
           let t = records[i]
-          me.urls.push({url:t.url})
+          me.urls.push({ url: t.url })
         }
       }).catch(e => {
         hideLoading()
@@ -644,8 +538,8 @@ export default {
         lotNo: me.ncCodeForm.lotNo,
         inspecResultSid: me.ncCodeForm.inspecResultSid,
         resourceBo: me.ncCodeForm.resourceBo,
-        operationBo:me.ncCodeForm.operationBo,
-        item:me.ncCodeForm.item
+        operationBo: me.ncCodeForm.operationBo,
+        item: me.ncCodeForm.item
       }
       showLoading()
       saveNc(param).then((res) => {
@@ -660,26 +554,38 @@ export default {
         hideLoading()
       })
     },
-    deleteInspecNc(index,row) {
+    deleteInspecNc(index, row) {
       let me = this
       this.$confirm('确定删除', {
         confirmButtonText: this.$t('common.confirm'),
         cancelButtonText: this.$t('common.cancel'),
         type: 'warning',
       }).then(() => {
+        me.inspecNcList.splice(index, 1)
         for (let i = 0; i < me.ncCodeList.length; i++) {
           if (me.ncCodeList[i].ncBasisBo === row.ncBasisBo) {
             me.$refs.multipleSelection.toggleRowSelection(me.ncCodeList[i], false);
           }
         }
-        me.inspecNcList.splice(index, 1)
       })
     },
     handleSelectionChange(val) {
       let me = this
-      for (let i = 0; i < val.length; i++){
-        me.inspecNcList.push(val[i])
+      if (val.length > 0) {
+        const resData = me.inspecNcList.filter(item => item.resFlag == true)
+        me.inspecNcList = [...val]
+        resData.forEach(element => {
+          me.inspecNcList.forEach(element2 => {
+            if (element.ncBasisBo === element2.ncBasisBo) {
+              let index =me.inspecNcList.indexOf(element2)
+            me.inspecNcList.splice(index, 1,element)
+          }
+         })
+        });
+      } else {
+        me.inspecNcList = []
       }
+
     },
     ncCodeFormClose() {
       let me = this
@@ -704,26 +610,28 @@ export default {
         operation: me.processForm.operation
       }
       showLoading()
-       await selectByOp(param).then((res) => {
+      await selectByOp(param).then((res) => {
         hideLoading()
         me.ncCodeList = res.data.data
         //me.multipleSelection = res.data.data
       }).catch(e => {
         hideLoading()
       })
-      await selectAllNc({inspecResultSid:row.sid}).then((re) => {
-          hideLoading()
-          me.inspecNcList = re.data
-          for (let i = 0; i < me.inspecNcList.length; i++) {
-            let inspecNc = me.inspecNcList[i]
-            for (let j = 0; j < me.ncCodeList.length; j++) {
-              if (me.ncCodeList[j].ncBasisBo === inspecNc.ncBasisBo) {
-                me.$refs.multipleSelection.toggleRowSelection(me.ncCodeList[j], true);
-              }
+      await selectAllNc({ inspecResultSid: row.sid }).then((re) => {
+        hideLoading()
+        let resData = re.data
+        for (let i = 0; i < resData.length; i++) {
+          let inspecNc = resData[i]
+          inspecNc.resFlag = true
+          for (let j = 0; j < me.ncCodeList.length; j++) {
+            if (me.ncCodeList[j].ncBasisBo === inspecNc.ncBasisBo) {
+              me.$refs.multipleSelection.toggleRowSelection(me.ncCodeList[j], true);
             }
           }
-        }).catch(e => {
-          hideLoading()
+        }
+        me.inspecNcList = re.data
+      }).catch(e => {
+        hideLoading()
       })
 
     },
@@ -740,14 +648,14 @@ export default {
         me.resultList = res.data.data
         if (me.resultList.length === 0) {
           me.resultList.push(
-              {
-                inspectionLevel: '0',
-                inspectionLevelDesc: 'NG',
-              },
-              {
-                inspectionLevel: '1',
-                inspectionLevelDesc: 'OK',
-              }
+            {
+              inspectionLevel: '0',
+              inspectionLevelDesc: 'NG',
+            },
+            {
+              inspectionLevel: '1',
+              inspectionLevelDesc: 'OK',
+            }
           )
         }
       }).catch(e => {
@@ -819,7 +727,7 @@ export default {
           }
         }
         hideLoading()
-      }).catch((e) =>{
+      }).catch((e) => {
         hideLoading()
       })
     },
@@ -828,90 +736,90 @@ export default {
       me.uploadData.inspecJobBo = row.inspecJobBo
       me.uploadData.inspecDetailBo = row.handle
     },
-  detailSave(row,index){
-    let me = this
-    console.log(row)
-    let inspecResults = []
-    //更新明细表中itemResult字段，更新 result字段
-    for (let i = 0; i < row.inspecResultList.length; i++) {
-      let d = row.inspecResultList[i]
-      if (isBlank(d.result)) {
-        return me.$message.error('请输入检测结果')
+    detailSave(row, index) {
+      let me = this
+      console.log(row)
+      let inspecResults = []
+      //更新明细表中itemResult字段，更新 result字段
+      for (let i = 0; i < row.inspecResultList.length; i++) {
+        let d = row.inspecResultList[i]
+        if (isBlank(d.result)) {
+          return me.$message.error('请输入检测结果')
+        }
+        //组装参数结果表中
+        let obj = {
+          qcItemJudge: d.qcItemJudge,
+          result: d.result,
+          sid: d.sid,
+          dateCreate: d.dateCreate,
+        }
+        inspecResults.push(obj)
       }
-      //组装参数结果表中
-      let obj = {
-        qcItemJudge:d.qcItemJudge,
-        result:d.result,
-        sid:d.sid,
-        dateCreate:d.dateCreate,
+      row.itemResult = row.result
+      if (row.qcItemJudge) {
+        row.result = '1'
+      } else {
+        row.result = '0'
       }
-      inspecResults.push(obj)
-    }
-    row.itemResult = row.result
-    if (row.qcItemJudge) {
-      row.result = '1'
-    } else {
-      row.result = '0'
-    }
-    row.inspecResults = inspecResults
-    let params = {
-      handle:row.handle,
-      inspecJobBo:row.inspecJobBo,
-      inspecResults:row.inspecResults,
-      avgJudge:row.avgJudge,
-      itemType:row.itemType,
-      maxValue:row.maxValue,
-      minValue:row.minValue,
-    }
-    saveInspecAndDetailResult(params).then((respData) => {
-      me.doSearch()
-      me.$message.success('保存成功')
-    })
-  },
+      row.inspecResults = inspecResults
+      let params = {
+        handle: row.handle,
+        inspecJobBo: row.inspecJobBo,
+        inspecResults: row.inspecResults,
+        avgJudge: row.avgJudge,
+        itemType: row.itemType,
+        maxValue: row.maxValue,
+        minValue: row.minValue,
+      }
+      saveInspecAndDetailResult(params).then((respData) => {
+        me.doSearch()
+        me.$message.success('保存成功')
+      })
+    },
     //下拉列表change事件
-  selectChange(val,row){
-    let me = this
-    this.$watch('message', () => {}, { immediate: false });
-    if (val.textNoDecide === '0') {
-      return row.qcItemJudge = false
-    } else {
-      return row.qcItemJudge = true
-    }
-  },
-  switchChange(e, row) {
-    let me = this;
-    this.$watch('message', () => {}, { immediate: false });
-    console.log(e)
-    console.log('Switch changed:', event, row);
-    if (e) {
-      return 'ok-cell'
-    } else {
-      return 'ng-cell'
-    }
-  },
-  // 数字输入限制
-  numInputChange(num, index, row, key) {
-    let me = this
-    let data = {
-      negative: false,
-      decimal: false,
-      decimalMax: 6,
-      symbol: true,
-      english: true,
-      chinese: true,
-    }
-    row.result = numberControl(num, data)
-    if (!isNaN(parseFloat(row.result))) {
-      if (Number(row.result) > Number(row.maxValue) || Number(row.result) < Number(row.minValue)) {
+    selectChange(val, row) {
+      let me = this
+      this.$watch('message', () => { }, { immediate: false });
+      if (val.textNoDecide === '0') {
         return row.qcItemJudge = false
       } else {
         return row.qcItemJudge = true
       }
-    } else {
-      return row.qcItemJudge = false
-    }
-  },
-  inputEnter(index) {
+    },
+    switchChange(e, row) {
+      let me = this;
+      this.$watch('message', () => { }, { immediate: false });
+      console.log(e)
+      console.log('Switch changed:', event, row);
+      if (e) {
+        return 'ok-cell'
+      } else {
+        return 'ng-cell'
+      }
+    },
+    // 数字输入限制
+    numInputChange(num, index, row, key) {
+      let me = this
+      let data = {
+        negative: false,
+        decimal: false,
+        decimalMax: 6,
+        symbol: true,
+        english: true,
+        chinese: true,
+      }
+      row.result = numberControl(num, data)
+      if (!isNaN(parseFloat(row.result))) {
+        if (Number(row.result) > Number(row.maxValue) || Number(row.result) < Number(row.minValue)) {
+          return row.qcItemJudge = false
+        } else {
+          return row.qcItemJudge = true
+        }
+      } else {
+        return row.qcItemJudge = false
+      }
+    },
+    inputEnter(index) {
       let me = this
       let result = [];
       for (let i = 0; i < me.qcTable.length; i++) {
@@ -924,7 +832,7 @@ export default {
           }
         }
       }
-        console.log(result);
+      console.log(result);
       // 获取当前行的下一个索引
       const nextIndex = index + 1;
       if (nextIndex < me.qcTable.length) {
@@ -932,21 +840,27 @@ export default {
           this.$refs.inputNum[nextIndex].focus();
         });
       }
-  },
-  closeForm() {
-    // 發送事件通知父組件關閉視窗
-    this.$emit('update:visible', false)
-    this.$emit('close', 'processModel')
-    this.qcSubCategoriesList = []
-    this.processForm = {}
+    },
+    closeForm() {
+      // 發送事件通知父組件關閉視窗
+      this.$emit('update:visible', false)
+      this.$emit('close', 'processModel')
+      this.qcSubCategoriesList = []
+      this.processForm = {}
     },
   }
 }
 </script>
 <style lang="scss" scoped>
+.my-custom-table ::v-deep .el-table__row {
+  height: 50px;
+  line-height: 50px;
+}
+
 .custInput {
   margin-bottom: -10px !important;
 }
+
 .form {
   padding: 10px;
   background-color: #f4f4f4;
@@ -954,17 +868,22 @@ export default {
   margin-top: 20px;
   border-radius: 10px;
 }
+
 .table-container {
-  max-height: 400px; /* 设置表格容器的最大高度 */
-  overflow-y: auto; /* 启用垂直滚动条 */
+  max-height: 400px;
+  /* 设置表格容器的最大高度 */
+  overflow-y: auto;
+  /* 启用垂直滚动条 */
 }
+
 ::v-deep .basic-container .el-table .redColor .el-input__inner {
-	color: red;
+  color: red;
 }
 
 ::v-deep .basic-container .el-table .blackColor .el-input__inner {
-	color: black;
+  color: black;
 }
+
 .ok-cell {
   background-color: #86ec86;
   color: white;
@@ -978,6 +897,7 @@ export default {
   padding: 8px;
   border-radius: 4px;
 }
+
 .table-container {
   width: 100%;
 }