Ver Fonte

feat(inspectionWork): 新增检验项目报告和样品列表视图组件

新增两个只读详情展示组件,用于在检验工作中展示检验工单的详细信息和样品列表数据。
yusheng há 3 meses atrás
pai
commit
5a4e172f6c

+ 760 - 0
src/views/inspectionWork/components/inspectionProjectReportView.vue

@@ -0,0 +1,760 @@
+<!-- 用户编辑弹窗 -->
+<template>
+  <div>
+    <ele-pro-table
+      :needPage="false"
+      :columns="workColumns"
+      :datasource="[form]"
+    >
+  
+      <template v-slot:craftFiles="{ row }">
+        <el-link type="primary" :underline="false" @click="craftFiles(row)"
+          >工艺文件</el-link
+        >
+      </template>
+
+      <template v-slot:isRequired="{ column }">
+        <span class="is-required">{{ column.label }}</span>
+      </template>
+      <template v-slot:qualityType="{ row }">
+        {{ getDictValue('质检计划类型', row.qualityType) }}
+      </template>
+      <template v-slot:qualityMode="{ row }">
+        {{ getDictValue('取样类型', row.qualityMode) }}
+      </template>
+      <template v-slot:hours="{ row }">
+        <el-input
+          v-model="row.hours"
+          placeholder="请输入"
+          type="number"
+          disabled
+        >
+        </el-input>
+      </template>
+      <template v-slot:accessory="{ row }">
+        <fileMain v-model="row.accessory" type="view"></fileMain>
+      </template>
+      <template v-slot:sampleQuantity="{ row }">
+        <el-input
+          v-model="row.sampleQuantity"
+          placeholder="请输入"
+          type="number"
+          disabled
+        >
+          <template slot="append">{{ form.measureUnit }}</template>
+        </el-input>
+      </template>
+      <template v-slot:sampleNoQualifiedNumber="{ row }">
+        <el-input
+          v-model="row.sampleNoQualifiedNumber"
+          placeholder="请输入"
+          type="number"
+          disabled
+        >
+          <template slot="append">{{ form.measureUnit }}</template>
+        </el-input>
+      </template>
+    </ele-pro-table>
+    <ele-pro-table
+      :needPage="false"
+      :columns="tableColumns"
+      :datasource="tableData"
+    >
+
+      <template v-slot:qualityStandardType="{ row }">
+        {{ getDictValue('质检标准类型', row.qualityStandardType) }}
+      </template>
+      <template v-slot:executionMethod="{ row }">
+        <el-select v-model="row.executionMethod" style="width: 100%" disabled>
+          <el-option :value="1" label="常规检验"></el-option>
+          <el-option :value="2" label="实验"></el-option>
+        </el-select>
+      </template>
+      <template v-slot:useTools="{ row }">
+        <toolButtom v-model="row.useTools" :type="type" :sList="row.toolList" />
+      </template>
+      <template v-slot:qualityResultContent="{ row }">
+        <el-input
+          v-model="row.qualityResultContent"
+          placeholder="请输入内容"
+          disabled
+        >
+          <template slot="append" v-if="row.unitName">
+            {{ row.unitName }}
+          </template>
+        </el-input>
+      </template>
+      <template v-slot:sampleQuantity="{ row, $index }">
+        <el-input
+          v-model="row.sampleQuantity"
+          placeholder="请输入"
+          disabled
+          type="number"
+        >
+          <template slot="append">{{ form.measureUnit }}</template>
+        </el-input>
+      </template>
+
+      <template v-slot:qualifiedQuantity="{ row, $index }">
+        <el-input
+          v-model="row.qualifiedQuantity"
+          placeholder="请输入"
+          disabled
+          type="number"
+        >
+          <template slot="append">{{ form.measureUnit }}</template>
+        </el-input>
+      </template>
+      <template v-slot:noQualifiedQuantity="{ row, $index }">
+        <el-input
+          v-model="row.noQualifiedQuantity"
+          placeholder="请输入"
+          disabled
+          type="number"
+        >
+          <template slot="append">{{ form.measureUnit }}</template>
+        </el-input>
+      </template>
+      <template v-slot:lossNumber="{ row, $index }">
+        <el-input
+          v-model="row.lossNumber"
+          placeholder="请输入"
+          disabled
+          type="number"
+        >
+          <template slot="append">{{ form.measureUnit }}</template>
+        </el-input>
+      </template>
+      <template v-slot:lossNumberUnqualified="{ row, $index }">
+        <el-input
+          v-model="row.lossNumberUnqualified"
+          placeholder="请输入"
+          disabled
+          type="number"
+        >
+          <template slot="append">{{ form.measureUnit }}</template>
+        </el-input>
+      </template>
+      <template v-slot:retainedSampleQuantity="{ row, $index }">
+        <el-input
+          v-model="row.retainedSampleQuantity"
+          placeholder="请输入"
+          disabled
+          type="number"
+        >
+          <template slot="append">{{ form.measureUnit }}</template>
+        </el-input>
+      </template>
+      <template v-slot:retainedSampleUnqualified="{ row, $index }">
+        <el-input
+          v-model="row.retainedSampleUnqualified"
+          placeholder="请输入"
+          disabled
+          type="number"
+        >
+          <template slot="append">{{ form.measureUnit }}</template>
+        </el-input>
+      </template>
+      <template v-slot:qualityResults="{ row, $index }">
+        <el-select
+          v-model="row.qualityResults"
+          placeholder="请选择"
+          style="width: 100%"
+          disabled
+        >
+          <el-option
+            v-for="item in qualityResultsList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </template>
+      <template v-slot:inspectImage="{ row, $index }">
+        <fileMain v-model="row.inspectImage" type="view"></fileMain>
+      </template>
+      <template v-slot:imgUrl="{ row, $index }">
+        <fileMain v-model="row.imgUrl" type="view"></fileMain>
+      </template>
+      <template v-slot:defaultValue="{ row }">
+        <div style="display: flex; justify-content: center; color: #409eff">
+          <span v-if="row.textType != 8">{{ row.symbol }}</span>
+          <span v-if="row.textType == 3">
+            {{ row.minValue }}-{{ row.maxValue }}
+          </span>
+          <span v-else-if="row.textType == 8">
+            标准值:{{ row.defaultValue }}{{ row.unitName || '' }} 下限:{{
+              row.minValue || 0
+            }}{{ row.unitName || '' }} 上限:{{ row.maxValue || 0
+            }}{{ row.unitName || '' }}
+          </span>
+          <span v-else>
+            <span>{{ row.defaultValue }}</span>
+          </span>
+          <span v-if="row.textType != 8">
+            {{ row.unitName }}
+          </span>
+        </div>
+      </template>
+      <template v-slot:inspectionName="{ row }">
+        <span style="color: #409eff">{{ row.inspectionName }}</span>
+      </template>
+      <template v-slot:isRequired="{ column }">
+        <span class="is-required">{{ column.label }}</span>
+      </template>
+      <template v-slot:action="{ row }">
+        <el-link
+          type="primary"
+          :underline="false"
+          @click="experimentReport(row, 'view')"
+          v-if="row.executionMethod == 2"
+        >
+          实验
+        </el-link>
+      </template>
+    </ele-pro-table>
+
+    <experimentReport
+      ref="experimentReport"
+      @done="experimentReportDone"
+      :pageName="pageName"
+    ></experimentReport>
+    <wokePopup ref="wokePopupRef"></wokePopup>
+  </div>
+</template>
+
+<script>
+  import dictMixins from '@/mixins/dictMixins';
+  import detailMixins from '../mixins/detailMixins';
+  import toolButtom from './toolButtom.vue';
+  import experimentReport from './experimentReport.vue';
+
+  import wokePopup from '@/components/workList/wokePopup.vue';
+  import { parameterGetByCode } from '@/api/main/index';
+  import { craftFiles, mesCraftFiles } from '@/api/inspectionWork';
+
+  export default {
+    mixins: [dictMixins, detailMixins],
+
+    components: { toolButtom, experimentReport, wokePopup },
+
+    data() {
+      return {
+        form: {},
+        tableData: [],
+        rowIndex: [],
+        curretNum: 0,
+        qms_qualityResultContent: 1,
+        workColumns: [
+          {
+            minWidth: 150,
+            prop: 'code',
+            align: 'center',
+            label: '检测项工单号',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 150,
+            prop: 'code',
+            align: 'center',
+            label: '检测工单编码',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 150,
+            prop: 'name',
+            align: 'center',
+            label: '检测工单名称',
+            showOverflowTooltip: true
+          },
+  
+          {
+            minWidth: 100,
+            prop: 'qualityType',
+            slot: 'qualityType',
+            align: 'center',
+            label: '类型',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 100,
+            slot: 'qualityMode',
+            prop: 'qualityMode',
+            align: 'center',
+            label: '检测方式',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'productCode',
+            align: 'center',
+            label: '编码',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'productName',
+            align: 'center',
+            label: '名称',
+            showOverflowTooltip: true
+          },
+
+          {
+            minWidth: 100,
+            prop: 'batchNo',
+            align: 'center',
+            label: '批次号',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'specification',
+            align: 'center',
+            label: '规格',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 100,
+            prop: 'brandNo',
+            align: 'center',
+            label: '牌号',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'produceTaskName',
+            align: 'center',
+            label: '工序名称',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'total',
+            align: 'center',
+            label: '总数量',
+            formatter: (row) => {
+              if (row.total) {
+                return row.total + this.form.measureUnit || '';
+              }
+            },
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 180,
+            prop: 'sampleQuantity',
+            headerSlot: 'isRequired',
+            slot: 'sampleQuantity',
+            align: 'center',
+            label: '样品数',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 180,
+            prop: 'sampleNoQualifiedNumber',
+            slot: 'sampleNoQualifiedNumber',
+            align: 'center',
+            label: '样品不合格数',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 140,
+            prop: 'sampleQualifiedNumber',
+            headerSlot: 'isRequired',
+            slot: 'sampleQualifiedNumber',
+            align: 'center',
+            formatter: (row) => {
+              if (row.sampleQualifiedNumber) {
+                return (
+                  row.sampleQualifiedNumber + (this.form.measureUnit || '')
+                );
+              }
+            },
+            label: '样品合格数',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 140,
+            prop: 'lossNumber',
+            slot: 'lossNumber',
+            align: 'center',
+            formatter: (row) => {
+              if (row.lossNumber) {
+                return row.lossNumber + (this.form.measureUnit || '');
+              }
+            },
+            label: '损耗数(合格品)',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 140,
+            prop: 'lossNumberUnqualified',
+            slot: 'lossNumberUnqualified',
+            align: 'center',
+            formatter: (row) => {
+              if (row.lossNumberUnqualified) {
+                return (
+                  row.lossNumberUnqualified + (this.form.measureUnit || '')
+                );
+              }
+            },
+            label: '损耗数(不合格品)',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 140,
+            prop: 'retainedSampleQuantity',
+            slot: 'retainedSampleQuantity',
+            align: 'center',
+            formatter: (row) => {
+              if (row.retainedSampleQuantity) {
+                return (
+                  row.retainedSampleQuantity + (this.form.measureUnit || '')
+                );
+              }
+            },
+            label: '留样数(合格品)',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 140,
+            prop: 'retainedSampleUnqualified',
+            slot: 'retainedSampleUnqualified',
+            align: 'center',
+            formatter: (row) => {
+              if (row.retainedSampleUnqualified) {
+                return (
+                  row.retainedSampleUnqualified + (this.form.measureUnit || '')
+                );
+              }
+            },
+            label: '留样数(不合格品)',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'hours',
+            slot: 'hours',
+            align: 'center',
+            label: '工时',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'accessory',
+            slot: 'accessory',
+            align: 'center',
+            label: '附件',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'qualityNames',
+            slot: 'qualityNames',
+            align: 'center',
+            label: '检测人',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'qualityTimeEnd',
+            slot: 'qualityTimeEnd',
+            align: 'center',
+            label: '检测时间',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'craftFiles',
+            slot: 'craftFiles',
+            align: 'center',
+            label: '工艺文件',
+            fixed: 'right',
+            showOverflowTooltip: true
+          }
+        ],
+
+        qualityResultsList: [
+          {
+            value: 1,
+            label: '合格'
+          },
+          {
+            value: 2,
+            label: '不合格'
+          },
+          {
+            value: 3,
+            label: '让步接收'
+          }
+        ],
+        sList: [] //质检工具筛选
+      };
+    },
+    computed: {
+      tableColumns() {
+        return [
+          {
+            width: 45,
+            type: 'index',
+            columnKey: 'index',
+            align: 'center',
+            fixed: 'left'
+          },
+          {
+            minWidth: 150,
+            prop: 'qualitySchemeTemplateCode',
+            align: 'center',
+            label: '检测方案编码',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'qualitySchemeTemplateName',
+            align: 'center',
+            label: '检测方案名称',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 100,
+            prop: 'categoryLevelClassName',
+            align: 'center',
+            label: '检测类型',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 130,
+            prop: 'inspectionCode',
+            align: 'center',
+            label: '检测项编码',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'inspectionName',
+            slot: 'inspectionName',
+            align: 'center',
+            label: '检测项名称',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 100,
+            prop: 'qualityStandardType',
+            slot: 'qualityStandardType',
+            align: 'center',
+            label: '执行标准',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 320,
+            slot: 'defaultValue',
+            prop: 'defaultValue',
+            align: 'center',
+            label: '工艺参数',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 130,
+            prop: 'executionMethod',
+            slot: 'executionMethod',
+            align: 'center',
+            label: '执行方法',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 100,
+            prop: 'useTools',
+            slot: 'useTools',
+            align: 'center',
+            label: '检测工具',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 200,
+            prop: 'qualityResultContent',
+            align: 'center',
+            slot: 'qualityResultContent',
+            headerSlot: this.qms_qualityResultContent == 1 ? 'isRequired' : '',
+            label: '检测内容',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 180,
+            prop: 'sampleQuantity',
+            slot: 'sampleQuantity',
+            headerSlot: 'isRequired',
+
+            align: 'center',
+            label: '样品数',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 180,
+            prop: 'qualifiedQuantity',
+            align: 'center',
+            slot: 'qualifiedQuantity',
+            label: '合格数',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 180,
+            prop: 'noQualifiedQuantity',
+            slot: 'noQualifiedQuantity',
+            align: 'center',
+            label: '不合格数',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 180,
+            prop: 'lossNumber',
+            slot: 'lossNumber',
+            align: 'center',
+            label: '损耗数(合格品)',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 180,
+            prop: 'lossNumberUnqualified',
+            slot: 'lossNumberUnqualified',
+            align: 'center',
+            label: '损耗数(不合格品)',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 180,
+            prop: 'retainedSampleQuantity',
+            slot: 'retainedSampleQuantity',
+            align: 'center',
+            label: '留样数(合格品)',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 180,
+            prop: 'retainedSampleUnqualified',
+            slot: 'retainedSampleUnqualified',
+            align: 'center',
+            label: '留样数(不合格品)',
+            showOverflowTooltip: true
+          },
+
+          {
+            minWidth: 130,
+            prop: 'qualityResults',
+            slot: 'qualityResults',
+            align: 'center',
+            label: '检测结果',
+            showOverflowTooltip: true,
+            fixed: 'right'
+          },
+          {
+            minWidth: 150,
+            prop: 'experimentCode',
+            align: 'center',
+            label: '实验编号',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'inspectImage',
+            slot: 'inspectImage',
+            align: 'center',
+            label: '检验图片',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 100,
+            prop: 'imgUrl',
+            slot: 'imgUrl',
+            align: 'center',
+            label: '附件',
+            showOverflowTooltip: true
+          },
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 120,
+            align: 'center',
+            resizable: false,
+            slot: 'action',
+            showOverflowTooltip: true,
+            fixed: 'right'
+          }
+        ];
+      },
+      getSampleQuantityCount() {
+        return this.form.sampleQuantity;
+      }
+    },
+
+    created() {
+      this.requestDict('质检计划类型');
+      this.requestDict('取样类型');
+      this.requestDict('质检标准类型');
+      parameterGetByCode({
+        code: 'qms_qualityResultContent'
+      }).then((res) => {
+        this.qms_qualityResultContent = res?.value;
+      });
+    },
+    methods: {
+      async craftFiles(row) {
+        const res = await parameterGetByCode({
+          code: 'mes_craft_file_by_category_code'
+        });
+        const byCategory = res?.value === '1';
+
+        if (byCategory) {
+          this.$refs.wokePopupRef.openTwo(row);
+        } else {
+          const data = row.qualityWorkOrderId
+            ? await craftFiles(row.qualityWorkOrderId)
+            : await mesCraftFiles({
+                taskId: row.produceTaskId,
+                workOrderId: row.mesWorkOrderId,
+                productCode: row.productCode
+              });
+          this.$refs.wokePopupRef.open(data.map((item) => item.id));
+        }
+      },
+      experimentReport(row, type) {
+        this.$refs.experimentReport.open(
+          {
+            ...row,
+            batchNo: this.form.batchNo,
+            qualityWorkOrderId: this.form.qualityWorkOrderId,
+            getSampleQuantityCount: this.form.sampleQuantity
+          },
+          type
+        );
+      },
+
+      async init({ workData, list }) {
+        this.tableData = [];
+        this.$set(this, 'form', JSON.parse(JSON.stringify(workData)));
+        this.$set(
+          this.form,
+          'sampleNoQualifiedNumber',
+          this.form.sampleNoQualifiedNumber || 0
+        );
+        this.$set(
+          this.form,
+          'sampleQualifiedNumber',
+          this.form.sampleQualifiedNumber ||
+            this.form.sampleQuantity - this.form.sampleNoQualifiedNumber ||
+            0
+        );
+
+        this.tableData = JSON.parse(JSON.stringify(list));
+      }
+    }
+  };
+</script>
+
+<style scoped lang="scss">
+  ::v-deep .warn {
+    color: red;
+    .el-input__inner {
+      color: red;
+    }
+  }
+</style>

+ 320 - 0
src/views/inspectionWork/components/sampleListView.vue

@@ -0,0 +1,320 @@
+<!-- 用户编辑弹窗 -->
+<template>
+  <div>
+    <el-table :data="tableData" :default-expand-all="true">
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <div style="padding: 10px">
+            <el-table :data="props.row.qualitySampleTemplateList" border>
+              <el-table-column
+                label="检测方案编码"
+                prop="qualitySchemeTemplateCode"
+                align="center"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <span :class="scope.row.qualityResults === 2 ? 'warn' : ''">
+                    {{ scope.row.qualitySchemeTemplateCode }}
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="检测方案名称"
+                prop="qualitySchemeTemplateName"
+                align="center"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <span :class="scope.row.qualityResults === 2 ? 'warn' : ''">
+                    {{ scope.row.qualitySchemeTemplateName }}
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="检测类型"
+                prop="categoryLevelClassName"
+                align="center"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <span :class="scope.row.qualityResults === 2 ? 'warn' : ''">
+                    {{ scope.row.categoryLevelClassName }}
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="检测项编码"
+                prop="inspectionCode"
+                align="center"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <span :class="scope.row.qualityResults === 2 ? 'warn' : ''">
+                    {{ scope.row.inspectionCode }}
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="检测项名称"
+                prop="inspectionName"
+                align="center"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <span :class="scope.row.qualityResults === 2 ? 'warn' : ''">
+                    {{ scope.row.inspectionName }}
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="工艺参数"
+                prop="defaultValue"
+                align="center"
+                show-overflow-tooltip
+                min-width="220px"
+              >
+                <template slot-scope="scope">
+                  <div
+                    style="display: flex; justify-content: center"
+                    :class="scope.row.qualityResults === 2 ? 'warn' : ''"
+                  >
+                    <span v-if="scope.row.textType != 8">{{
+                      scope.row.symbol
+                    }}</span>
+                    <span v-if="scope.row.textType == 3">
+                      {{ scope.row.minValue }}-{{ scope.row.maxValue }}
+                    </span>
+                    <span v-else-if="scope.row.textType == 8">
+                      标准值:{{ scope.row.defaultValue
+                      }}{{ scope.row.unitName || '' }} 下限:{{
+                        scope.row.minValue || 0
+                      }}{{ scope.row.unitName || '' }} 上限:{{
+                        scope.row.maxValue || 0
+                      }}{{ scope.row.unitName || '' }}
+                    </span>
+                    <span v-else>
+                      <span>{{ scope.row.defaultValue }}</span>
+                    </span>
+                    <span v-if="scope.row.textType != 8">
+                      {{ scope.row.unitName }}
+                    </span>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="检测工具" prop="" align="center">
+                <template slot-scope="scope">
+                  <toolButtom
+                    v-model="scope.row.useTools"
+                    :type="'detail'"
+                    :sList="scope.row.toolList"
+                  />
+                </template>
+              </el-table-column>
+
+              <!-- @blur="(e) => inputResultContent(e, scope.row)" -->
+              <el-table-column
+                label="检测内容"
+                prop="qualityResultContent"
+                align="center"
+                fixed="right"
+                width="360"
+              >
+                <template slot-scope="scope">
+                  <el-input
+                    :class="scope.row.qualityResults === 2 ? 'warn' : ''"
+                    v-model="scope.row.qualityResultContent"
+                    placeholder="请输入内容"
+                    disabled
+                  >
+                    <template slot="append" v-if="scope.row.unitName">
+                      {{ scope.row.unitName }}
+                    </template>
+                  </el-input>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="检测结果"
+                prop="qualityResults"
+                align="center"
+                fixed="right"
+              >
+                <template slot-scope="scope">
+                  <el-select
+                    v-if="
+                      !['炉水电导率', '给水电导率'].includes(
+                        scope.row.inspectionName
+                      )
+                    "
+                    v-model="scope.row.qualityResults"
+                    placeholder="请选择"
+                    style="width: 100%"
+                    @change="qualityResultsListChange(tableData)"
+                    disabled
+                  >
+                    <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>
+          </div>
+        </template>
+      </el-table-column>
+      <template v-for="column in tableColumns">
+        <el-table-column
+          :label="column.label"
+          :prop="column.prop"
+          :fixed="column.fixed"
+          :show-overflow-tooltip="true"
+          :width="column.width"
+          :align="column.align"
+          :formatter="column.formatter"
+        >
+        </el-table-column>
+      </template>
+    </el-table>
+  </div>
+</template>
+
+<script>
+  import toolButtom from './toolButtom.vue';
+  export default {
+    components: {
+      toolButtom
+    },
+    data() {
+      return {
+        rowIndex: 0,
+        type: '',
+        tableData: [],
+        pageName: '',
+        tableColumns: [
+          {
+            label: '编码',
+            prop: 'categoryCode',
+            width: '150',
+            align: 'center'
+          },
+          {
+            label: '名称',
+            prop: 'categoryName',
+            width: '150',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          { label: '批次号', prop: 'batchNo', align: 'center' },
+          // { label: '发货条码', prop: 'barcodes', align: 'center' },
+          { label: '包装编码', prop: 'packageNo', align: 'center' },
+          { label: '样品编码', prop: 'sampleCode', align: 'center' },
+          { label: '包装数量', prop: 'packingQuantity', align: 'center' },
+          // { label: '包装单位', prop: 'packingUnit', align: 'center' },
+          { label: '样品数量', prop: 'measureQuantity', align: 'center' },
+          // { label: '计量单位', prop: 'measureUnit', align: 'center' },
+          { label: '物料代号', prop: 'materielDesignation', align: 'center' },
+          { label: '客户代号', prop: 'clientCode', align: 'center' },
+          { label: '刻码', prop: 'engrave', align: 'center' },
+          {
+            label: '型号',
+            prop: 'modelType',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '规格',
+            prop: 'specification',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '电压等级',
+            prop: 'voltage',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          { label: '重量', prop: 'weight', align: 'center' },
+          { label: '重量单位', prop: 'weightUnit', align: 'center' },
+          { label: '仓库', prop: 'warehouseName', align: 'center' },
+          {
+            label: '检测结果',
+            prop: 'qualityResults',
+            align: 'center',
+            slot: 'qualityResults',
+            formatter: (row, column) => {
+              if (row.qualityResults) {
+                return row.qualityResults == 1
+                  ? '合格'
+                  : row.qualityResults == 2
+                  ? '不合格'
+                  : row.qualityResults == 3
+                  ? '让步接收'
+                  : '';
+              }
+            }
+          }
+        ],
+        qualityResultsList: [
+          {
+            value: 1,
+            label: '合格'
+          },
+          {
+            value: 2,
+            label: '不合格'
+          },
+          {
+            value: 3,
+            label: '让步接收'
+          }
+        ],
+        clientEnvironmentId: '',
+        sList: [] //检测工具筛选
+      };
+    },
+    computed: {},
+
+    created() {},
+    methods: {
+      init(list) {
+        this.clientEnvironmentId =
+          this.$store.state.user.info.clientEnvironmentId;
+        this.tableData = [];
+
+        if (list[0].qualitySampleTemplateList.length == 1) {
+          for (let i = 0; i < list[0].qualitySampleTemplateList.length; i++) {
+            list[0].qualitySampleTemplateList[i].qualityResults = list[0]
+              .qualityResults
+              ? list[0].qualityResults
+              : 1;
+          }
+        }
+        // 默认合格
+        list.map((item) => {
+          item.qualitySampleTemplateList &&
+            item.qualitySampleTemplateList.map((el) => {
+              el.qualityResults = el.qualityResults ? el.qualityResults : 1;
+            });
+        });
+        this.tableData = JSON.parse(JSON.stringify(list));
+      },
+
+      //选择检测工具
+      openToolList(index, row) {
+        this.$emit('openToolList', index, row);
+      }
+    }
+  };
+</script>
+
+<style scoped lang="scss">
+  ::v-deep .warn {
+    color: red;
+    .el-input__inner {
+      color: red;
+    }
+  }
+</style>

+ 24 - 3
src/views/inspectionWork/details.vue

@@ -185,7 +185,7 @@
                   <fileMain ref="fileMainRef" type="view" v-model="accessory" />
                 </el-form-item>
               </el-col>
-              <el-col :span="18" v-if="$route.query.name=='计划'">
+              <el-col :span="18" v-if="$route.query.name == '计划'">
                 <el-form-item label="周期">
                   <rule-cycle
                     ref="cycleMultipleRef"
@@ -467,6 +467,13 @@
           >
           </ele-pro-table>
         </el-tab-pane>
+        <el-tab-pane label="报工详情" name="6">
+          <inspectionProjectReportView
+            v-if="form.recordingMethod == 1"
+            ref="inspectionProjectReportViewRef"
+          ></inspectionProjectReportView>
+          <sampleListView v-else ref="sampleListViewRef"></sampleListView>
+        </el-tab-pane>
       </el-tabs>
       <el-button class="go_back" @click="goBack">返回</el-button>
     </el-card>
@@ -490,7 +497,9 @@
   import { getUserPage } from '@/api/system/organization';
   import { recordingMethodList } from '@/utils/util.js';
   import sampleListDialog from './components/sampleListDialog.vue';
+  import sampleListView from './components/sampleListView.vue';
   import experimentReport from './components/experimentReport.vue';
+  import inspectionProjectReportView from './components/inspectionProjectReportView.vue';
   import inspectionProjectReport from '@/views/inspectionWork/components/inspectionProjectReport.vue';
   import sampleReport from '@/views/inspectionWork/components/sampleReport.vue';
   import { getById as getByIdProjectTask } from '@/api/inspectionProjectTask';
@@ -503,7 +512,8 @@
       sampleListDialog,
       experimentReport,
       inspectionProjectReport,
-      sampleReport,
+      inspectionProjectReportView,
+      sampleReport,sampleListView,
       RuleCycle
     },
     data() {
@@ -662,7 +672,7 @@
           this.form.status = res.status;
           this.form.qualityWorkOrderDetailVO = res.qualityWorkOrderDetailVO;
           this.accessory = res.accessory;
-          console.log(result, 'result');
+          console.log(this.form, 'result');
           if (name == '计划') {
             this.form.total = result.data.productNumber || 0;
             this.$nextTick(() => {
@@ -671,6 +681,17 @@
               );
             });
           }
+          this.$nextTick(() => {
+            if (this.form.recordingMethod == 1) {
+              this.$refs.inspectionProjectReportViewRef.init({
+                workData: this.form,
+                list: this.form.templateList
+              });
+            } else {
+              this.$refs.sampleListViewRef.init(this.form.qualitySampleList);
+            }
+          });
+
           this.fieldAssign(res, obj);
           this.sampleInfo(res);
           console.log('this.form~~~~', this.form);

+ 2 - 1
src/views/unqualifiedProduct/unqualifiedList/detailList.vue

@@ -53,6 +53,7 @@
             title="确定要删除吗?"
             @confirm="remove"
             style="margin-left: 10px"
+            v-if="!form.sourceCode"
           >
             <template v-slot:reference>
               <el-button :disabled="selection.length == 0" type="danger"
@@ -65,7 +66,7 @@
           <el-popconfirm
             class="ele-action"
             title="确定要删除吗?"
-            v-if="row.disposalStatus !== 2"
+            v-if="row.disposalStatus !== 2&&!form.sourceCode"
             @confirm="remove(row)"
           >
             <template v-slot:reference>

+ 18 - 9
src/views/unqualifiedProduct/unqualifiedList/index.vue

@@ -33,7 +33,11 @@
         </template>
         <template v-slot:action="{ row }">
           <el-link
-            v-if="row.status == 0 && [0, 3].includes(row.approvalStatus)"
+            v-if="
+              row.status == 0 &&
+              [0, 3].includes(row.approvalStatus) &&
+              !row.sourceCode
+            "
             type="primary"
             :underline="false"
             icon="el-icon-truck"
@@ -44,7 +48,11 @@
           <el-popconfirm
             class="ele-action"
             title="确定要删除吗?"
-            v-if="row.status == 0 && [0, 3].includes(row.approvalStatus)"
+            v-if="
+              row.status == 0 &&
+              [0, 3].includes(row.approvalStatus) &&
+              !row.sourceCode
+            "
             @confirm="remove(row)"
           >
             <template v-slot:reference>
@@ -56,7 +64,8 @@
           <el-link
             v-if="
               (row.status == 0 || row.status == 1) &&
-              [0, 3].includes(row.approvalStatus)
+              [0, 3].includes(row.approvalStatus) &&
+              (!unqualified_approval || unqualified_approval == 0)
             "
             type="primary"
             :underline="false"
@@ -68,7 +77,7 @@
           <el-link
             v-if="
               (row.status == 0 || row.status == 1) &&
-              [0, 3].includes(row.approvalStatus)
+              [0, 3].includes(row.approvalStatus)&&unqualified_approval == 1
             "
             type="primary"
             :underline="false"
@@ -319,11 +328,11 @@
     created() {
       this.requestDict('质检计划类型');
       this.requestDict('处置状态');
-      // parameterGetByCode({
-      //   code: 'unqualified_approval'
-      // }).then((res) => {
-      //   this.unqualified_approval = res.value;
-      // });
+      parameterGetByCode({
+        code: 'unqualifiedList_approval'
+      }).then((res) => {
+        this.unqualified_approval = res.value;
+      });
     },
     filters: {},
     methods: {