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

spring

2025-04-09 c7f3b447415448e6ae570882900ee129590f580b

Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable

 src/api/structural/workshop.js

@@ -53,3 +53,12 @@
    params: query,
  });
}

// 根据车间id获取文件列表
export function getFileListById(query) {
  return request({
    url: '/workShop/fileListById',
    method: 'get',
    params: query,
  })
}

 src/views/business/inspectionTask/index.vue

@@ -253,6 +253,7 @@
  },
  data() {
    return {
      workShopId: null,
      issuedVisible: false,
      fullscreen: false,
      lookDialogVisible: false,
@@ -779,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;
@@ -790,6 +792,7 @@
          state: this.state,
          typeSource: this.typeSource,
          orderId: this.orderId,
          workShopId: row.workShopId
        },
      });
    },

 src/views/business/inspectionTask/inspection.vue

@@ -147,8 +147,7 @@
      </div>
      <!-- 常规检验原始记录 -->
      <div id="nav" v-loading="tableLoading" class="center-box">
        <template v-if="
          tableLists.find((m) => m.templateId == currentTable)">
        <template v-if="tableLists.find((m) => m.templateId == currentTable)">
          <table v-for="(item, index) in tableList" :key="index + currentTable + currentSample.id" border="1"
            cellpadding="10" class="tables" id="myTable">
            <tbody>
@@ -167,8 +166,7 @@
                    };`">
                  <div :class="`content-h-${n.v.ht} content-v-${n.v.vt}`" :style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]
                    }px;`" class="content">
                    <template v-if="
                      n.v.ps != undefined &&
                    <template v-if="n.v.ps != undefined &&
                      typeof n.v.ps.value === 'string' &&
                      n.v.ps.value.includes('检验值') &&
                      state == 1
@@ -254,8 +252,7 @@
                        <span v-else :style="`font-family:${n.v.ff} !important;`">待定</span>
                      </template>
                    </template>
                    <template v-else-if="
                      n.v.ps != undefined &&
                    <template v-else-if="n.v.ps != undefined &&
                      n.v.ps.value === '设备编码' &&
                      state == 1
                    ">
@@ -274,8 +271,7 @@
                        </el-option>
                      </el-select>
                    </template>
                    <template v-else-if="
                      n.v.ps != undefined &&
                    <template v-else-if="n.v.ps != undefined &&
                      n.v.ps.value === '要求值' &&
                      state == 1
                    ">
@@ -299,8 +295,7 @@
                        toFixed(n.v.v, n.v.ct)
                      }}</span>
                    </template>
                    <template v-else-if="
                      n.v.ps != undefined && n.v.ps.value === '样品编号'
                    <template v-else-if="n.v.ps != undefined && n.v.ps.value === '样品编号'
                    ">
                      <div :title="currentSample.sampleCode" style="
                        display: flex;
@@ -316,11 +311,9 @@
                        <i class="el-icon-caret-right table_caret" style="width: 16px" @click="caretSample(1)"></i>
                      </div>
                    </template>
                    <template v-else-if="
                      n.v.ps != undefined && n.v.ps.value === '样品型号'
                    <template v-else-if="n.v.ps != undefined && n.v.ps.value === '样品型号'
                    ">
                      <div v-if="
                        currentSample.model !== undefined &&
                      <div v-if="currentSample.model !== undefined &&
                        currentSample.model !== null
                      " :style="`font-family:${n.v.ff} !important;`">
                        {{ currentSample.model }}
@@ -509,7 +502,7 @@
    <InspectionWord v-if="unPassCheck" :inspectorList="inspectorList" :orderId="orderId"
      :rawMaterialTag="rawMaterialTag" :sonLaboratory="sonLaboratory" :state="state" :typeSource="typeSource"
      :unPassCheck="unPassCheck" @closeUnPassCheckDialog="closeUnPassCheckDialog" @refreshView="refreshView" />
    <purchase-verification v-if="purchaseDialog" ref="purchaseDialog" :orderId="orderId"
    <purchase-verification v-if="purchaseDialog" ref="purchaseDialog" :orderId="orderId" :workShopId="workShopId"
      :purchaseDialog="purchaseDialog" @resetPurchaseDialog="resetPurchaseDialog"></purchase-verification>
    <!--查看工时弹框-->
    <viewManHourDia ref="viewManHourDia" @submit="openAddVerifyDia"></viewManHourDia>
@@ -560,6 +553,7 @@
  data() {
    return {
      sonLaboratory: null,
      workShopId: null,
      orderId: null,
      state: null,
      inspectorList: null,
@@ -776,8 +770,9 @@
    },
  },
  created() {
    let { sonLaboratory, orderId, state, inspectorList, typeSource } =
    let { sonLaboratory, orderId, state, inspectorList, typeSource, workShopId } =
      this.$route.query;
    this.workShopId = workShopId
    this.sonLaboratory = sonLaboratory;
    this.orderId = orderId;
    this.id = this.orderId;

 src/views/business/materialOrder/customsInspection.vue

@@ -1055,7 +1055,10 @@
        delete this.addObj.createTime
      }
      addInsOrder({
        insOrder: this.addObj,
        insOrder: {
          ...this.addObj,
          workShopId: this.addObj.workShopId || ''  // 确保 workShopId 传递给后端
        },
        sampleList: sampleList.map(a => {
          a.standardMethodListId = JSON.stringify(a.standardMethodListId)
           a.insProduct = this.fullProductList

 src/views/business/unpass/components/PurchaseVerification.vue

@@ -44,8 +44,11 @@
          <div>
            <el-form-item class="headLine" label="验证依据文件编号:" label-width="160px" style="width: 100%"
              prop="verifyFileCode">
              <el-input clearable v-model="purchaseForm.verifyFileCode" size="small"
                :disabled="operationType === 'view'" placeholder="请输入"></el-input>
              <el-select v-model="purchaseForm.verifyFileCode" clearable filterable size="small"
                :disabled="operationType === 'view'" placeholder="请选择">
                <el-option v-for="item in fileList" :key="item.id" :label="item.fileName" :value="item.fileName">
                </el-option>
              </el-select>
            </el-form-item>
          </div>
          <h4>
@@ -149,7 +152,8 @@
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="$emit('resetPurchaseDialog')">取 消</el-button>
        <el-button type="primary" @click="handlePurchase" :loading="handlePurchaseLoading" v-if="operationType === 'add'">确定</el-button>
        <el-button type="primary" @click="handlePurchase" :loading="handlePurchaseLoading"
          v-if="operationType === 'add'">确定</el-button>
      </span>
    </el-dialog>
    <el-dialog title="待验证项目" :visible.sync="factoryVerifyItemDia" width="1000px"
@@ -180,6 +184,7 @@

<script>
import { getFactoryVerify, addFactoryVerify } from '@/api/business/unpass.js'
import { getFileListById } from "@/api/structural/workshop.js"
import {
  getInsProduct,
} from "@/api/business/inspectionTask.js";
@@ -196,6 +201,10 @@
      type: String,
      default: () => null
    },
    workShopId: {
      type: [String, Number],
      default: () => null
    }
  },
  data() {
    // 这里存放数据
@@ -240,7 +249,8 @@
      factoryVerifyItemDia: false, // 添加验证项目弹框
      handleFactoryVerifyLoading: false,
      inspectionItemDia: false,
      inspectionItem: ''
      inspectionItem: '',
      fileList: [], // 添加文件列表数据
    }
  },
  // 方法集合
@@ -248,6 +258,8 @@
    async getInsOrder(operationType, item) {
      this.operationType = operationType
      this.info = item
      // 获取文件列表
      await this.getFileList()
      // 查询已提交的数据
      let factoryVerify = await getFactoryVerify({ insOrderId: this.orderId })
      this.purchaseForm = factoryVerify.data
@@ -276,6 +288,20 @@
          this.tableList.push(obj)
        })
        this.tableLoading = false;
      }
    },

    // 获取文件列表
    async getFileList() {
      try {
        const res = await getFileListById({
          workShopId: this.workShopId
        })
        if (res.code === 200) {
          this.fileList = res.data
        }
      } catch (error) {
        console.error('获取文件列表失败:', error)
      }
    },
    handleSelectionChange(val) {
@@ -345,6 +371,7 @@
.headLine>>>.el-form-item__content {
  width: 68%;
}

>>>.el-form-item__content {
  display: inline-block;
}