同步质检代码

src/views/produce/components/qualityInspection/index.vue

@@ -44,7 +44,10 @@
           <template v-slot:specialInspection="{ row }">
             <el-button
               type="primary"
-              :disabled="row.status != 2"
+              :disabled="
+                row.status != 2 &&
+                $hasPermission('mes:report:selfInspectionReporting')
+              "
               @click="reportClick(row, 2)"
               >{{ row.status == 3 ? '已报工' : '报工' }}</el-button
             >

src/views/produce/components/workPlan/components/newQualityContentTabs.vue

@@ -176,14 +176,13 @@
       <!--  -->
       <el-tab-pane label="样品清单" name="2">
         <el-table
-          v-show="sampleList.length > 0"
+          v-if="sampleList.length > 0"
           ref="showSampleListTable"
           :data="paginatedSampleList"
           tooltip-effect="dark"
-          height="500px"
+          height="500"
           border
-          :row-key="getRowKey"
-          style="width: 100%"
+          row-key="id"
         >
           <el-table-column
             label="序号"
@@ -194,7 +193,7 @@
           ></el-table-column>
           <template v-for="(column, index) in tableColumns">
             <el-table-column
-              :key="column.prop || index"
+              :key="index"
               :label="column.label"
               :prop="column.prop"
               :fixed="column.fixed"
@@ -253,7 +252,7 @@
               </template>
             </el-table-column>
           </template>
-
+          <!-- *** fixed="right"  -->
           <el-table-column
             label="处置状态"
             prop="disposeType"
@@ -264,7 +263,7 @@
               <span>{{ disposeTypeList[scope.row.disposeType] }}</span>
             </template>
           </el-table-column>
-
+          <!-- ***  fixed="right" -->
           <el-table-column
             label="处置时间"
             prop="disposeTime"
@@ -272,13 +271,14 @@
             :show-overflow-tooltip="true"
           >
           </el-table-column>
-
+          <!-- *** fixed="right" -->
           <el-table-column
             label="质检状态"
             prop="qualityStatus"
             align="center"
             fixed="right"
             :show-overflow-tooltip="true"
+            v-if="form.recordingMethod != 1"
           >
             <template slot-scope="scope">
               <span v-if="scope.row.qualityStatus == 0">未检</span>
@@ -293,6 +293,7 @@
             width="180"
             fixed="right"
             :show-overflow-tooltip="true"
+            v-if="form.recordingMethod != 1"
           >
             <template slot-scope="scope">
               <el-select
@@ -313,12 +314,69 @@
               </el-select>
             </template>
           </el-table-column>
+          <el-table-column
+            label="不良类型"
+            align="center"
+            v-if="form.recordingMethod != 1"
+            prop="badTypeId"
+            width="180"
+          >
+            <template v-slot="{ row, $index }">
+              <el-select
+                v-model="row.badTypeId"
+                placeholder="请选择不良类型"
+                size="small"
+                style="width: 100%"
+                remote
+                filterable
+                clearable
+                @change="badTypeChange(row)"
+              >
+                <el-option
+                  v-for="item in badTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="不良名称"
+            align="center"
+            prop="badNameId"
+            width="180"
+            v-if="form.recordingMethod != 1"
+          >
+            <template v-slot="{ row, $index }">
+              <el-select
+                v-model="row.badNameId"
+                placeholder="请选择不良名称"
+                size="small"
+                style="width: 100%"
+                remote
+                filterable
+                clearable
+                @change="badNameChange(row)"
+              >
+                <el-option
+                  v-for="item in badNameList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
           <el-table-column
             label="操作"
             align="center"
             width="120"
             fixed="right"
-            v-if="type != 'detail'"
+            v-if="type != 'detail' && form.recordingMethod != 1"
           >
             <template slot-scope="scope">
               <el-link
@@ -328,9 +386,24 @@
               >
                 质检
               </el-link>
+              <!-- <el-link
+                type="primary"
+                :underline="false"
+                @click="handleDispose(scope.$index, scope.row, 'dispose')"
+                >处置
+              </el-link> -->
             </template>
           </el-table-column>
         </el-table>
+        <!-- <el-pagination
+          @size-change="handleSampleSizeChange"
+          @current-change="handleSampleCurrentChange"
+          :current-page="samplePagination.currentPage"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="samplePagination.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="sampleList.length"
+        /> -->
       </el-tab-pane>
       <!--  -->
       <el-tab-pane label="质检方案" name="3">
@@ -381,6 +454,11 @@
             prop="inspectionName"
             align="center"
           ></el-table-column>
+          <el-table-column label="附件" prop="imgUrl" align="center">
+            <template slot-scope="scope">
+              <fileMain v-model="scope.row.imgUrl" type="view"></fileMain>
+            </template>
+          </el-table-column>
           <el-table-column
             label="工艺参数"
             show-overflow-tooltip
@@ -404,16 +482,75 @@
           </el-table-column>
 
           <el-table-column
-            fixed="right"
-            label="操作"
-            width="80"
-            v-if="type !== 'detail'"
+            label="执行方法"
+            prop="executionMethod"
+            align="center"
+            :show-overflow-tooltip="true"
+            v-if="form.recordingMethod == 1"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.executionMethod == 1 ? '常规' : '实验' }}
+            </template></el-table-column
           >
+          <el-table-column
+            label="质检状态"
+            prop="status"
+            align="center"
+            :show-overflow-tooltip="true"
+            v-if="form.recordingMethod == 1"
+          >
+            <template slot-scope="scope">
+              {{
+                inspectionProjectStatus.find(
+                  (item) => item.value == scope.row.status
+                )?.label
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="质检结果"
+            prop="qualityResults"
+            align="center"
+            width="180"
+            :show-overflow-tooltip="true"
+            v-if="form.recordingMethod == 1"
+          >
+            <template slot-scope="scope">
+              <el-select
+                @change="selectQualityResultsChange"
+                v-model="scope.row.qualityResults"
+                placeholder="请选择"
+                style="width: 100%"
+                :disabled="
+                  type == 'detail' || [2, 3, 4].includes(scope.row.status)
+                "
+                size="mini"
+              >
+                <el-option
+                  v-for="item in qualityResultsList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="150" v-if="type !== 'detail'">
             <template slot-scope="scope">
+              <!-- <el-link
+                v-if="form.recordingMethod == 1"
+                :type="scope.row.isValid ? 'primary' : 'danger'"
+                :underline="false"
+                @click="inspectionProjectReport(scope.$index, scope.row)"
+              >
+                质检
+              </el-link> -->
               <el-popconfirm
                 class="ele-action"
                 title="确定要删除当前方案吗？"
                 @confirm="handDel(scope.$index)"
+                v-if="![1, 2, 3, 4].includes(scope.row.status)"
               >
                 <template v-slot:reference>
                   <el-link
@@ -556,7 +693,7 @@
         activeNameKK: '',
         samplePagination: { currentPage: 1, pageSize: 10 },
         schemePagination: { currentPage: 1, pageSize: 10 },
-
+        inspectionProjectStatus,
         qualityResultsList: [
           {
             value: 1,