From d2e867966539004b6b5a73ae3566a659ac6f8b6d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 30 十月 2025 11:55:34 +0800
Subject: [PATCH] 检验任务数据分类查询问题修复
---
src/views/business/productOrder/components/addOrder.vue | 2 +-
src/views/business/inspectionReview/index.vue | 10 ++++++----
src/views/business/reportPreparation/index.vue | 9 ++++++---
src/views/business/inspectionTask/inspection.vue | 14 +-------------
src/views/business/inspectionTask/index.vue | 24 +++++++++++-------------
5 files changed, 25 insertions(+), 34 deletions(-)
diff --git a/src/views/business/inspectionReview/index.vue b/src/views/business/inspectionReview/index.vue
index 6e3eb15..2bce1d0 100644
--- a/src/views/business/inspectionReview/index.vue
+++ b/src/views/business/inspectionReview/index.vue
@@ -105,10 +105,12 @@
width: "100px",
dataType: "tag",
formatData: (params) => {
- if (params == 0 ) {
- return "鎴愬搧涓嬪崟";
- } else {
+ if (params == 0) {
+ return "澶栬喘涓嬪崟";
+ } else if(params==1) {
return "鍘熸潗鏂欎笅鍗�";
+ }else{
+ return "濮旀墭涓嬪崟";
}
},
},
@@ -247,7 +249,7 @@
sonLaboratoryList: [],
typeSourceList: [
{ label: '濮旀墭涓嬪崟', value: -1 },
- { label: '鎴愬搧涓嬪崟', value: 0 },
+ { label: '澶栬喘涓嬪崟', value: 0 },
{ label: '鍘熸潗鏂欎笅鍗�', value: 1 },
],
isCopper: null,
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 246b94b..841df1e 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -283,9 +283,9 @@
},
claimVisible: false,
tabList: [
- { label: "濮旀墭", value: 0 },
+ { label: "濮旀墭", value: -1 },
{ label: "鍘熸潗鏂�", value: 1 },
- { label: "澶栬喘", value: 2 },
+ { label: "澶栬喘", value: 0 },
],
active: 1,
tabIndex: 0,
@@ -293,7 +293,7 @@
planTotal: 0,
insStateList: [],
state: 0, // 0:鍙拌处椤碉紝1锛氭楠岄〉闈�,2妫�楠岄〉闈�(澶嶆牳)锛岄粯璁や负0,3鏁版嵁鏌ョ湅
- typeSource: null, // 0:鎴愬搧涓嬪崟锛�1锛氬師鏉愭枡涓嬪崟
+ typeSource: -1, // 0:澶栬喘鎴愬搧涓嬪崟锛�1锛氬師鏉愭枡涓嬪崟
sonLaboratory: null, // 0:濮旀墭锛�1锛氬師鏉愭枡
activeFace: 0, // 1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝榛樿涓�0
currentId: null,
@@ -369,9 +369,11 @@
dataType: "tag",
formatData: (params) => {
if (params == 0) {
- return "鎴愬搧涓嬪崟";
- } else {
+ return "澶栬喘涓嬪崟";
+ } else if(params==1) {
return "鍘熸潗鏂欎笅鍗�";
+ }else{
+ return "濮旀墭涓嬪崟";
}
},
},
@@ -558,6 +560,7 @@
mounted() {
this.getAuthorizedPerson();
this.queryParams.userId = this.userId;
+ this.queryParams.typeSource = this.typeSource
this.currentTime = getYearAndMonthAndDays();
this.getDicts("urgency_level").then((response) => {
this.urgencyLevel = this.dictToValue(response.data);
@@ -576,6 +579,7 @@
this.getDicts("inspection_task_state").then((response) => {
this.inspectionTaskState = this.dictToValue(response.data);
});
+ this.queryParams.typeSource = this.typeSource
this.refreshTable();
},
methods: {
@@ -648,14 +652,8 @@
},
refreshTable(e) {
this.page.current = 1;
- let typeSource = null;
- if(this.tabIndex===1){
- typeSource=1
- }else if(this.tabIndex===2){
- typeSource = 0
- }
this.queryParams.tabLabel = this.tabLabel;
- this.queryParams.typeSource = typeSource;
+ this.queryParams.typeSource = this.typeSource;
this.getList();
},
// 涓嬭浇鎶ュ憡
@@ -742,7 +740,7 @@
},
handleTab(m, i) {
this.tabIndex = i;
- this.tabLabel = m.label;
+ this.typeSource =m.value;
this.queryParams.sonLaboratory = "";
this.refreshTable();
},
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 7f8b10d..780fbc4 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -20,7 +20,7 @@
<el-button v-if="insOrder.ifsOrderType && insOrder.ifsOrderType==='02wg'" size="small" type="primary" @click="showMaterialPropsDialog">IFS鐗╂枡灞炴�ф洿鏂�</el-button>
<el-button size="small" type="primary" @click="refreshView">鍒锋柊</el-button>
<el-button v-if="typeSource == 1" size="small" type="primary" @click="openPurchase">杩涜揣楠岃瘉</el-button>
- <el-button v-if="state == 1 && typeSource == 1" size="small" type="primary"
+ <el-button v-if="state == 1 && [0,1].includes(typeSource)" size="small" type="primary"
@click="openUnPassDialog('add')">涓嶅悎鏍煎鐞�</el-button>
<el-button size="small" type="primary" @click="sampleVisible = true; uploadSample();">鏍峰搧鍒囨崲</el-button>
<!-- <el-button v-if="state == 1" size="small" type="primary" @click="taskVisible = true">浠诲姟鍒囨崲</el-button>-->
@@ -986,7 +986,6 @@
}
});
}
- console.log("澶勭悊鍚庣殑妯℃澘-",this.tableList)
},
// 鐗规畩妫�楠岄」--鐩戝惉璁惧淇℃伅鏀瑰彉
equipForm: {
@@ -1085,9 +1084,6 @@
},
disconnect() {
return disconnect
- },
- sss() {
- console.log(this.$store.state.weightList) //
},
// 鏂囦欢绠＄悊--寮�濮�
getList() {
@@ -1389,7 +1385,6 @@
return newObj;
},
handleDataAcquisition(data, noDialog) {
- console.log("dadad--",data)
// 鏄惁鍙互缂栬緫鏁伴噰鏁版嵁
if (this.dataAcquisitionEidtAble) {
this.getDataType = 1;
@@ -1413,9 +1408,7 @@
};
}
// 寰幆鏁伴噰鏁版嵁
- console.log(data[i],i)
for (let j in data[i]) {
- console.log("jjjjj--",j)
// 鎷兼帴瀛楃涓� 妫�楠岄」鍒嗙被+妫�楠岄」+妫�楠屽瓙椤�
let str0 = "";
if (i.includes("@")) {
@@ -1542,7 +1535,6 @@
}
let num = 0;
list[index].forEach((n) => {
- // console.log(n.v.ps.value);
if (
n.v.ps &&
n.v.ps.value &&
@@ -1619,7 +1611,6 @@
this.getDataIndexLoading = false;
this.dataGetDia = false;
this.getDataTypeId = "";
- console.log("dadada---",this.dataAcquisitionInfo)
this.worker0.postMessage(
JSON.stringify({
dataAcquisitionInfo: this.dataAcquisitionInfo,
@@ -1633,7 +1624,6 @@
// 鐩戝惉 Worker 杩斿洖鐨勭粨鏋�
this.worker0.onmessage = (event) => {
let result = JSON.parse(event.data);
- console.log("Worker 杩斿洖鐨勭粨鏋�:", result);
if (result.method == "changeInput") {
// 閲囬泦鍚庣殑鏁版嵁锛岄渶瑕佽繘琛岃绠楃殑绾跨▼杩涜璁＄畻
let { list, n } = result.value;
@@ -2162,7 +2152,6 @@
let aa = inspectionItemClass +
inspectionItem +
inspectionItemSubclass;
- console.log(aa,str,aa===str)
if (
this.currentSample.insProduct[i].templateId ===
a.templateId &&
@@ -2864,7 +2853,6 @@
orderId: this.orderId,
laboratory: this.sonLaboratory,
}).then((res) => {
- console.log(res)
if (res.code === 200) {
if (!res.data || res.data.errorMsg.length == 0) {
this.submitLoading = true;
diff --git a/src/views/business/productOrder/components/addOrder.vue b/src/views/business/productOrder/components/addOrder.vue
index 6863580..5e40926 100644
--- a/src/views/business/productOrder/components/addOrder.vue
+++ b/src/views/business/productOrder/components/addOrder.vue
@@ -1306,7 +1306,7 @@
})
}else{
// 甯歌鎻愪氦
- addInsOrder({insOrder: this.addObj, sampleList: sampleList}).then(res => {
+ addInsOrder({insOrder: {...this.addObj,typeSource:-1}, sampleList: sampleList}).then(res => {
this.saveLoad = false
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index fb3275b..b9a04e8 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -259,7 +259,8 @@
verifyUser: null, // 瀹℃牳浜哄憳
loadingVerify: false, // 瀹℃牳浜哄憳
typeSourceList: [
- { label: '鎴愬搧涓嬪崟', value: 0 },
+ { label: '濮旀墭涓嬪崟', value: -1 },
+ { label: '澶栬喘涓嬪崟', value: 0 },
{ label: '鍘熸潗鏂欎笅鍗�', value: 1 },
],
orderTypeList: [
@@ -363,9 +364,11 @@
dataType: "tag",
formatData: (params) => {
if (params == 0) {
- return "鎴愬搧涓嬪崟";
- } else {
+ return "澶栬喘涓嬪崟";
+ } else if(params==1) {
return "鍘熸潗鏂欎笅鍗�";
+ }else{
+ return "濮旀墭涓嬪崟";
}
},
},
--
Gitblit v1.9.3