From df3902e7eae5dd38a2d47aa63e5f27131f701db9 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 20 四月 2026 13:49:14 +0800
Subject: [PATCH] 绩效管理模块调整
---
src/views/business/inspectionTask/inspection.vue | 115 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 90 insertions(+), 25 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index dd99387..977484e 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -422,6 +422,19 @@
<lims-table :tableData="tableData0" :column="column0" :page="page0" :tableLoading="tableLoading0"
:height="'calc(100vh - 90px)'" :currentChange="handleChangeTask"></lims-table>
</el-drawer>
+ <el-dialog
+ title="鍝戦搩鐗囪澶囪瘯鏍风被鍨�"
+ :visible.sync="dialogVisible"
+ :before-close="handleDialogCancel"
+ width="30%">
+ <el-select v-model="deviceDbTableName" placeholder="璇烽�夋嫨璇曟牱绫诲瀷" style="width:100%" size="small">
+ <el-option label="鐗囩姸" value="TestData"></el-option>
+ <el-option label="绠＄姸" value="TestData2"></el-option>
+ </el-select>
+ <span slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="handleDialogConfirm">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
<el-dialog :visible.sync="reviewDia" title="妫�楠屽鏍�" width="500px">
<div v-if="reviewDia" class="body" style="display: flex; padding: 10px">
<div class="search_label" style="width: 150px">
@@ -664,6 +677,11 @@
},
data() {
return {
+ // 瀛樺偍 Promise 鐨� resolve/reject锛岀敤浜庡脊妗嗙‘璁�/鍙栨秷鏃惰皟鐢�
+ dialogResolve: null,
+ dialogReject: null,
+ dialogVisible: false,
+ deviceDbTableName: '',
outerColorList:[],
insulationColorList:[],
letteringInfoList: [],
@@ -1313,35 +1331,82 @@
this.$refs.purchaseDialog.$refs["purchaseForm"].resetFields();
this.purchaseDialog = false;
},
+ openDialog() {
+ this.dialogVisible = true;
+ this.deviceDbTableName = ''; // 閲嶇疆琛ㄥ崟
+ // 杩斿洖 Promise锛岀瓑寰呯敤鎴锋搷浣�
+ return new Promise((resolve, reject) => {
+ this.dialogResolve = resolve;
+ this.dialogReject = reject;
+ });
+ },
+ // 寮规纭鎻愪氦
+ handleDialogConfirm() {
+ // 鍏抽棴寮规
+ this.dialogVisible = false;
+ // 璋冪敤 resolve锛屼紶閫掕〃鍗曟暟鎹紝鎭㈠鎵ц鍚庣画浠ｇ爜
+ this.dialogResolve(this.deviceDbTableName);
+ },
+ // 寮规鍙栨秷/鍏抽棴
+ handleDialogCancel() {
+ console.log(111)
+ this.dialogVisible = false;
+ // 璋冪敤 reject锛岀粓姝㈠悗缁唬鐮�
+ this.dialogReject();
+ },
// 鏁版嵁閲囬泦
-
- getDataAcquisitionDevice() {
- let itemIds = [];
- this.currentSample.insProduct.forEach((item) => {
- if (item.inspectionItemType === "1") {
- itemIds.push(item.id);
+ async getDataAcquisitionDevice() {
+ //杩囨护閫変腑鐨勮澶囧垪琛�
+ let deviceList = []
+ for (let item in this.param){
+ let val1 = this.param[item]
+ for(let item2 in val1){
+ if(item2==='equipName'){
+ let equipName = val1[item2]
+ equipName.forEach(item=>{
+ if(item.v.v && Array.isArray(item.v.v)){
+ deviceList.push(...item.v.v)
+ }
+ })
+ }
}
- });
- const params = {
- entrustCode: this.insOrder.entrustCode,
- lotBatchNo: this.insOrder.lotBatchNo,
- sampleCode: this.currentSample.sampleCode,
- id: this.currentSample.id,
- itemIds: itemIds,
- };
- this.dataAcquisitionLoading = true;
- dataCollection(params).then((res) => {
- this.dataAcquisitionLoading = false;
- if (res.code != 200) {
- return;
+ }
+ //鏁扮粍鍘婚噸
+ let deviceSetList = [...new Set(deviceList)]
+ try{
+ if(deviceSetList.includes('NS-YL3141') && !this.deviceDbTableName){
+ await this.openDialog();
}
- this.dataAcquisitionInfoNew = this.HaveJson(res.data);
- // 瀵规暟閲囧洖鏉ョ殑鍊艰繘琛屽鐞�
- this.handleDataAcquisition(res.data);
- }).catch(err => {
- this.dataAcquisitionLoading = false;
- });
+ let itemIds = [];
+ this.currentSample.insProduct.forEach((item) => {
+ if (item.inspectionItemType === "1") {
+ itemIds.push(item.id);
+ }
+ });
+ const params = {
+ entrustCode: this.insOrder.entrustCode,
+ lotBatchNo: this.insOrder.lotBatchNo,
+ sampleCode: this.currentSample.sampleCode,
+ id: this.currentSample.id,
+ itemIds: itemIds,
+ dbTable: this.deviceDbTableName,
+ };
+ this.dataAcquisitionLoading = true;
+ dataCollection(params).then((res) => {
+ this.dataAcquisitionLoading = false;
+ if (res.code != 200) {
+ return;
+ }
+ this.dataAcquisitionInfoNew = this.HaveJson(res.data);
+ // 瀵规暟閲囧洖鏉ョ殑鍊艰繘琛屽鐞�
+ this.handleDataAcquisition(res.data);
+ }).catch(err => {
+ this.dataAcquisitionLoading = false;
+ });
+ }catch (error){
+ console.error('鏁版嵁閲囬泦璁惧鍒楄〃澶勭悊澶辫触',error)
+ }
},
objectOrder(obj) {
let newkey = Object.keys(obj).sort();
--
Gitblit v1.9.3