Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-r...

spring

2025-04-09 c7f3b447415448e6ae570882900ee129590f580b

 src/views/business/inspectionTask/index.vue

@@ -46,17 +46,17 @@
              :disabled="(scope.row.userName == null || scope.row.insState == 3 || scope.row.insState == 5) && checkPermi(['update:product:onPlan'])"
              @click="editInspection(scope.row)">修改检验值</el-button>
            <el-button type="text" size="small" :disabled="(
              scope.row.userName == null ||
              scope.row.insState == 3 ||
              scope.row.insState == 5 ||
              (scope.row.userName && !scope.row.userName.includes(nickName))
            )" @click="handleInspection(scope.row)">检验</el-button>
          scope.row.userName == null ||
          scope.row.insState == 3 ||
          scope.row.insState == 5 ||
          (scope.row.userName && !scope.row.userName.includes(nickName))
        )" @click="handleInspection(scope.row)">检验</el-button>
            <el-button type="text" size="small" :disabled="(
              scope.row.userName == null ||
              scope.row.insState == 5 ||
              scope.row.insState == 3 ||
              (scope.row.userName && !scope.row.userName.includes(nickName))
            )" @click="handleConnect(scope.row)">交接</el-button>
          scope.row.userName == null ||
          scope.row.insState == 5 ||
          scope.row.insState == 3 ||
          (scope.row.userName && !scope.row.userName.includes(nickName))
        )" @click="handleConnect(scope.row)" v-if="tabIndex != 0">交接</el-button>
            <el-button type="text" size="small" @click="viewInspectInfo(scope.row)">原始记录</el-button>
            <el-popover placement="bottom" trigger="hover" style="margin-left: 6px">
              <template #reference>
@@ -64,21 +64,21 @@
              </template>
              <div>
                <el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
                  (scope.row.userName && !scope.row.userName.includes(nickName)))" style="margin-left: 10px"
          (scope.row.userName && !scope.row.userName.includes(nickName)))" style="margin-left: 10px"
                  type="text" size="small" @click="download(scope.row)">下载报告</el-button>
                <el-upload ref='upload' :action="javaApi + '/insReport/inReport'" :before-upload="beforeUpload"
                  :data="{ id: scope.row.insReportId }" :headers="uploadHeader" :on-error="onError"
                  :on-success="handleSuccessUp" :show-file-list="false" style="display: inline;margin: 0 6px"
                  accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'>
                  <el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
                    (scope.row.userName && !scope.row.userName.includes(nickName)))" size="small"
          (scope.row.userName && !scope.row.userName.includes(nickName)))" size="small"
                    type="text">上传</el-button>
                </el-upload>
                <el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
                  (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small"
          (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small"
                  @click="handleRestore(scope.row)">还原</el-button>
                <el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
                  (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small"
          (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small"
                  @click="handleIssued(scope.row)">查看报告</el-button>
              </div>
            </el-popover>
@@ -88,8 +88,8 @@
    </div>
    <el-dialog :visible.sync="claimVisible" title="提示" width="400px">
      是否认领委托编号<span style="color: #33c130">{{
        sampleUserForm.entrustCode
      }}</span>的任务
          sampleUserForm.entrustCode
        }}</span>的任务
      <span slot="footer" class="dialog-footer">
        <el-button @click="claimVisible = false">取 消</el-button>
        <el-button :loading="loading" type="primary" @click="confirmClaim">确 定</el-button>
@@ -253,6 +253,7 @@
  },
  data() {
    return {
      workShopId: null,
      issuedVisible: false,
      fullscreen: false,
      lookDialogVisible: false,
@@ -275,7 +276,7 @@
      claimVisible: false,
      tabList: [
        { label: "委托", value: 0 },
        { label: "原辅料", value: 1 },
        { label: "原材料", value: 1 },
      ],
      active: 1,
      tabIndex: 0,
@@ -283,8 +284,8 @@
      planTotal: 0,
      insStateList: [],
      state: 0, // 0:台账页，1：检验页面,2检验页面(复核)，默认为0,3数据查看
      typeSource: null, // 0:成品下单，1：原辅料下单
      sonLaboratory: null, // 0:委托，1：原辅料
      typeSource: null, // 0:成品下单，1：原材料下单
      sonLaboratory: null, // 0:委托，1：原材料
      activeFace: 0, // 1：下单，2：查看，3：审核，默认为0
      currentId: null,
      entityCopy: {},
@@ -300,7 +301,7 @@
      sonLaboratoryList: [],
      typeSourceList: [
        { label: "成品下单", value: 0 },
        { label: "原辅料下单", value: 1 },
        { label: "原材料下单", value: 1 },
      ],
      customsInspection: {},
      showInfoDialog: false, // 产业链信息查看
@@ -330,7 +331,7 @@
        },
        {
          value: "Quarterly inspection",
          label: "季度检验",
          label: "可靠性检验",
          type: "warning",
          effect: "plain",
        },
@@ -356,7 +357,7 @@
            if (params == 0) {
              return "成品下单";
            } else {
              return "原辅料下单";
              return "原材料下单";
            }
          },
        },
@@ -496,6 +497,7 @@
            }
          },
        },
        { label: "检验人", prop: "checkUserName" },
        {
          dataType: "action",
          fixed: "right",
@@ -730,7 +732,7 @@
      this.currentId = parseInt(row.id);
      switch (row.isCopper) {
        case 0:
          // 原辅料
          // 原材料
          this.$router.push({
            path: "/materialOrder/customsInspection", query: {
              customsInspection: row,
@@ -778,6 +780,7 @@
      }
      this.inspectorList = inspectorList;
      this.sonLaboratory = row.sonLaboratory;
      this.workShopId = row.workShopId;
      this.state = 1;
      this.typeSource = row.typeSource;
      this.orderId = row.id;
@@ -789,6 +792,7 @@
          state: this.state,
          typeSource: this.typeSource,
          orderId: this.orderId,
          workShopId: row.workShopId
        },
      });
    },