- {{!isStart ? '测厚数据' : '结束查询'}}
+
+
+ 测厚数据
+
JSON.stringify(item) === JSON.stringify(row))
+ console.log('arr=============',arr)
+ this.getDChyData = arr
+ },
handleCreate(){
createInspection({}).then(res => {
if(res.data.code == 200){
@@ -940,6 +986,16 @@ export default {
this.thicknessData = row.wpItemDetailList
return
}
+ },
+ searchThinkData(){
+ const itemDetail = {
+ // tools: row.trialItem,
+ // testType: '镀后测厚',
+ // ruleSize: row.trialStandard,
+ // prWorkPlanItem: { wpiId: row.wpiId },
+ gaugeValue7: null,
+ gaugeValue8: null
+ };
this.isStart = !this.isStart;
if(this.isStart){
this.thicknessData = this.thicknessData.length > 0 ? this.thicknessData : []
@@ -961,7 +1017,6 @@ export default {
clearInterval(this.firstInterval)
clearInterval(this.secondInderval)
}
-
},
getValue(value) {
if (value == '/') {
@@ -999,23 +1054,24 @@ export default {
// endTime:endTime,
allData,
// count:val
- }).then(res =>{
+ }).catch(res =>{
console.log('res111111111111',res)
- if (res.data.data != null) {
- const resultList = res.data.data;
+ // if (res.data.data != null) {
+ // const resultList = res.data.data;
- // const resultList = [{
- // IP:"10.15.3.26",
- // devCode:"Ni/CuZn59",
- // devId:"LG020029",
- // fi1etime: "2025/11/21 16:38:32",
- // measurings: [
- // {unit: "um", name: "Ni", value: "8.92142"},
- // {unit: "/", name: "Cu", value: "/"},
- // {unit: "/", name: "Cu", value: "/"}
- // ]
- // }]
+ const resultList = [{
+ IP:"10.15.3.26",
+ devCode:"Ni/CuZn59",
+ devId:"LG020029",
+ fi1etime: "2025/11/21 16:38:32",
+ measurings: [
+ {unit: "um", name: "Ni", value: "8.92142"},
+ {unit: "/", name: "Cu", value: "/"},
+ {unit: "/", name: "Cu", value: "/"}
+ ]
+ }]
console.log('resultList--------------',resultList)
+ console.log('getDChyData--------------',this.getDChyData)
if (resultList.length > 0) {
resultList.forEach((item) => {
let isExist = false;
@@ -1083,7 +1139,7 @@ export default {
}
this.getDChyData = [...map.values()];
console.log('this.getDChyData',this.getDChyData)
- }
+ // }
})
},
testValue(row, index) {
@@ -1279,6 +1335,10 @@ export default {
})
// },window.YINGDU_Trigger)
}
+ if(item.item.specialType == 1){
+ console.log('item------------------',item)
+ this.thicknessData = item.wpItemDetailList
+ }
})
}
diff --git a/src/views/warehouseManagement/additionalPlan/components/additionalPlan.vue b/src/views/warehouseManagement/additionalPlan/components/additionalPlan.vue
index 853f5b1..3056ac3 100644
--- a/src/views/warehouseManagement/additionalPlan/components/additionalPlan.vue
+++ b/src/views/warehouseManagement/additionalPlan/components/additionalPlan.vue
@@ -447,12 +447,14 @@ export default {
startDeclareDate:this.query.declareDate && this.query.declareDate.length != 0 && this.query.declareDate[0],
endDeclareDate:this.query.declareDate && this.query.declareDate.length != 0 && this.query.declareDate[1],
}
- let {needDate,declareDate,...searchParams} = params
- console.log('searchParams',searchParams)
+ // let {needDate,declareDate,...searchParams} = params
+ if(params.declareDate) delete params.declareDate
+ if(params.needDate) delete params.needDate
+ console.log('params',params)
getList({
current:this.page.currentPage,
size:this.page.pageSize,
- ...searchParams
+ ...params
}).then(res =>{
this.data = res.data.data.records
this.page.total = res.data.data.total
diff --git a/src/views/warehouseManagement/leveragingManagement.vue b/src/views/warehouseManagement/leveragingManagement.vue
index c39b08d..cd3919b 100644
--- a/src/views/warehouseManagement/leveragingManagement.vue
+++ b/src/views/warehouseManagement/leveragingManagement.vue
@@ -880,12 +880,13 @@ export default {
startLeDate:this.query.leDate && this.query.leDate.length > 0 && this.query.leDate[0],
endLeDate:this.query.leDate && this.query.leDate.length > 0 && this.query.leDate[1],
}
- const {leDate,...searchParams} = params
- console.log('sezrch------------',searchParams)
+ if(params.leDate) delete params.leDate
+ // const {leDate,...searchParams} = params
+ // console.log('sezrch------------',searchParams)
getList({
current:this.page.currentPage,
size:this.page.pageSize,
- ...searchParams
+ ...params
}).then(res =>{
this.data = res.data.data.records
this.page.total = res.data.data.total
diff --git a/src/views/warehouseManagement/materialExpiration/expire.vue b/src/views/warehouseManagement/materialExpiration/expire.vue
index 2b22de9..59bbe61 100644
--- a/src/views/warehouseManagement/materialExpiration/expire.vue
+++ b/src/views/warehouseManagement/materialExpiration/expire.vue
@@ -408,11 +408,12 @@ export default {
startDueDate:this.query.scrapCycle && this.query.scrapCycle.length != 0 && this.query.scrapCycle[0],
endDueDate:this.query.scrapCycle && this.query.scrapCycle.length != 0 && this.query.scrapCycle[1],
}
- const {scrapCycle,...invalideParams} = params
+ // const {scrapCycle,...invalideParams} = params
+ if(params.scrapCycle) delete params.scrapCycle
getList({
current:this.page.currentPage,
size:this.page.pageSize,
- ...invalideParams
+ ...params
}).then(res =>{
this.data = res.data.data.records
this.page.total = res.data.data.total
diff --git a/src/views/warehouseManagement/teamRequest/index.vue b/src/views/warehouseManagement/teamRequest/index.vue
index 5ff0de7..ddbfe76 100644
--- a/src/views/warehouseManagement/teamRequest/index.vue
+++ b/src/views/warehouseManagement/teamRequest/index.vue
@@ -343,11 +343,12 @@ export default {
startCrDate:this.query.crDate && this.query.crDate.length != 0 && this.query.crDate[0],
endCrDate:this.query.crDate && this.query.crDate.length != 0 && this.query.crDate[1],
}
- const {crDate,...validParams} = params
+ // const {crDate,...validParams} = params
+ if(params.crDate) delete params.crDate
getList({
current:this.page.currentPage,
size:this.page.pageSize,
- ...validParams
+ ...params
}).then(res =>{
this.data = res.data.data.records
this.page.total = res.data.data.total
diff --git a/src/views/warehouseManagement/warehouseRequest/components/record.vue b/src/views/warehouseManagement/warehouseRequest/components/record.vue
index ec3af22..d8f3256 100644
--- a/src/views/warehouseManagement/warehouseRequest/components/record.vue
+++ b/src/views/warehouseManagement/warehouseRequest/components/record.vue
@@ -341,10 +341,16 @@ export default {
},
onLoad() {
this.loading = true
+ let param = {
+ ...this.query,
+ startCreateTime:this.query && this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[0],
+ endCreateTime:this.query && this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[1],
+ }
+ if(param.createTime) delete param.createTime
getRecords({
current:this.page.currentPage,
size:this.page.pageSize,
- ...this.query
+ ...param
}).then(res =>{
this.data = res.data.data.records
this.page.total = res.data.data.total
diff --git a/src/views/warehouseManagement/workwearPlan/index.vue b/src/views/warehouseManagement/workwearPlan/index.vue
index bff30d8..b68feac 100644
--- a/src/views/warehouseManagement/workwearPlan/index.vue
+++ b/src/views/warehouseManagement/workwearPlan/index.vue
@@ -680,11 +680,12 @@ export default {
startNeedDate:this.query.needDate && this.query.needDate.length != 0 && this.query.needDate[0],
endNeedDate:this.query.needDate && this.query.needDate.length != 0 && this.query.needDate[1]
}
- const {needDate,...searchParam} = params
+ if(params.needDate) delete params.needDate
+ // const {needDate,...searchParam} = params
getList({
current: this.page.currentPage,
size: this.page.pageSize,
- ...searchParam
+ ...params
}).then(res => {
this.data = res.data.data.records;
this.page.total = res.data.data.total;