From 3d61c610c0aa2276ad838f5906bf0b25492ab211 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 05 十一月 2025 12:46:51 +0800
Subject: [PATCH] 数采调整
---
src/views/login.vue | 4 ++--
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 4 ++--
src/api/business/rawMaterialOrder.js | 7 +++++++
src/views/business/inspectionTask/inspection.vue | 4 ++--
src/views/business/materialOrder/index.vue | 15 +++++++++++++--
5 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/api/business/rawMaterialOrder.js b/src/api/business/rawMaterialOrder.js
index a37df10..a95d6ec 100644
--- a/src/api/business/rawMaterialOrder.js
+++ b/src/api/business/rawMaterialOrder.js
@@ -295,3 +295,10 @@
data: query
})
}
+// 鏍规嵁ifsId鏌ヨ涓嬪崟鏁伴噺
+export function getOrderCountByIfsId(ifsId) {
+ return request({
+ url: '/rawMaterialOrder/getOrderCountByIfsId/'+ifsId,
+ method: 'get',
+ })
+}
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index 012b6d4..b6500ce 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -471,8 +471,8 @@
deviceId: this.deviceId,
inspectionItem: row.inspectionItem.trim(),
isDevice: true,
- inspectionItemSubclass: row.inspectionItemSubclass.trim(),
- inspectionItemClass: row.inspectionItemClass.trim(),
+ inspectionItemSubclass: row.inspectionItemSubclass?row.inspectionItemSubclass.trim():"",
+ inspectionItemClass: row.inspectionItemClass?row.inspectionItemClass.trim():"",
structureItemParameterId: row.structureItemParameterId
}).then(res => {
const data = res.data;
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 780fbc4..976df1d 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 && [0,1].includes(typeSource)" size="small" type="primary"
+ <el-button v-if="state == 1 && [0,1].includes(Number(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>-->
@@ -1167,7 +1167,7 @@
laboratory: this.sonLaboratory,
}).then(async (res) => {
this.insOrder = res.data.insOrder;
- if(res.data.insOrder.ifsOrderType){
+ if(res.data.insOrder.ifsOrderType==='02wg'){
//鏌ヨ闆朵欢灞炴��
this.getPartProps(res.data.insOrder.ifsInventoryId)
}
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 52c433f..5b5c439 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -201,7 +201,8 @@
repealEnterRawOrder,
repealQuarterRawOrder,
revokeInspectionReport,
- updateEntrustCode
+ updateEntrustCode,
+ getOrderCountByIfsId
} from "@/api/business/rawMaterialOrder";
import { getWarehouseSubmit } from "@/api/business/materialInspection";
import {mapGetters} from "vuex";
@@ -1190,7 +1191,17 @@
},
// 涓嬪崟
playOrder(row) {
- this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: {isOutsourcing:'f', orderType: 0, customsInspection: row, active: 1 } });
+ //鏌ヨ褰撳墠鎵规鏄惁宸茬粡涓嬪崟
+ getOrderCountByIfsId(row.id).then(res=>{
+ if(res.code===200 && res.data>0){
+ this.$message.warning('璇ユ壒娆″凡涓嬪崟锛岃鍕块噸澶嶄笅鍗�')
+ this.refreshTable('page')
+ return
+ }
+ this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: {isOutsourcing:'f', orderType: 0, customsInspection: row, active: 1 } });
+ }).catch(error=>{
+ console.error(error)
+ })
},
// 瀛ｅ害妫�楠屼笅鍗�
playOrderSec(row) {
diff --git a/src/views/login.vue b/src/views/login.vue
index c9c9bba..abb6bd4 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -58,8 +58,8 @@
return {
codeUrl: "",
loginForm: {
- username: "admin",
- password: "zttZTT123!",
+ username: "ZT-",
+ password: "",
rememberMe: false,
code: "",
uuid: ""
--
Gitblit v1.9.3