From c7f3b447415448e6ae570882900ee129590f580b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 09 四月 2025 17:47:30 +0800
Subject: [PATCH] Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable
---
src/views/business/unpass/components/PurchaseVerification.vue | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/src/views/business/unpass/components/PurchaseVerification.vue b/src/views/business/unpass/components/PurchaseVerification.vue
index ae4619d..09ddced 100644
--- a/src/views/business/unpass/components/PurchaseVerification.vue
+++ b/src/views/business/unpass/components/PurchaseVerification.vue
@@ -1,7 +1,7 @@
<template>
<div>
<el-dialog title="杩涜揣楠岃瘉鍘熷璁板綍" :visible.sync="isShow" width="70%" :show-close="false" :close-on-click-modal="false"
- :modal-append-to-body="false" :close-on-press-escape="false">
+ :modal-append-to-body="false" :close-on-press-escape="false">
<div class="search">
<el-form :inline="true" :model="purchaseForm" label-position="right" :rules="purchaseFormRules"
ref="purchaseForm" class="form-inline" label-width="120px">
@@ -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>
@@ -125,7 +128,7 @@
</div>
<div>
<el-table :data="factoryVerifyItemList" style="width: 98%" v-loading="tableLoading"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="index" label="搴忓彿" width="180" align="center"></el-table-column>
<el-table-column prop="inspectionItem" label="楠岃瘉椤圭洰" width="300"></el-table-column>
<el-table-column prop="result" label="楠岃瘉缁撴灉">
@@ -149,15 +152,16 @@
</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"
style="max-height: 96vh; margin-top: 2vh" :show-close="false" :close-on-click-modal="false"
:close-on-press-escape="false">
<el-table :data="tableList" style="width: 100%" v-loading="tableLoading"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
- @selection-change="handleSelectionChange">
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" label="搴忓彿" width="60" align="center"></el-table-column>
<el-table-column prop="inspectionItem" label="楠岃瘉椤圭洰"></el-table-column>
@@ -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;
}
--
Gitblit v1.9.3