diff --git a/package.json b/package.json
index 69a1956..68cfab4 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
"qrcodejs2": "0.0.2",
"quill": "1.3.7",
"screenfull": "5.0.2",
+ "sm-crypto": "^0.3.13",
"sortablejs": "1.10.2",
"uuid": "^9.0.1",
"vue": "2.6.12",
diff --git a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
index 5014ed1..c10ff3e 100644
--- a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
@@ -1270,7 +1270,13 @@ export default {
},
/* 抱杆成套设备change事件 */
async onChangeWholeTypeName(val) {
- val.forEach((e) => {
+ console.log("rrrrrrrrrrrrrrrr",val)
+ console.log("ppppppppppppppp",this.holdingPoleSelList)
+ val = val.filter(e => e !== null && e !== undefined);
+ if (val.length == 0) {
+ this.wholeTypeNameList = []
+ }else{
+ val.forEach((e) => {
const selLable = this.holdingPoleSelList.find((j) => j.id === e)
const isPush = this.wholeTypeNameList.some((z) => z.id == e)
@@ -1295,6 +1301,7 @@ export default {
})
}
})
+ }
},
// 移除时触发
diff --git a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
index 17e3810..38e9daa 100644
--- a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
+++ b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
@@ -751,9 +751,12 @@ export default {
taskName: this.queryParams.taskName,
}
})
- this.wholeTypeNameList.push(ctList)
+ if(this.wholeTypeNameList.length == 0){
+ this.wholeTypeNameList.push(ctList)
+ }
+ // this.wholeTypeNameList.push(ctList)
}
-
+
console.log(this.wholeTypeNameList, ' this.wholeTypeNameList')
},
// 取消按钮
diff --git a/src/views/claimAndreturn/return/receive/component/home.vue b/src/views/claimAndreturn/return/receive/component/home.vue
index a0b1619..c607074 100644
--- a/src/views/claimAndreturn/return/receive/component/home.vue
+++ b/src/views/claimAndreturn/return/receive/component/home.vue
@@ -134,17 +134,17 @@
type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
/>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+