From be0301e67768fb183df7e29f411a7e54dbf15c40 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 五月 2024 10:37:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
wx/unpackage/dist/dev/mp-weixin/pages/addPersonnel/addPersonnel.js | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/wx/unpackage/dist/dev/mp-weixin/pages/addPersonnel/addPersonnel.js b/wx/unpackage/dist/dev/mp-weixin/pages/addPersonnel/addPersonnel.js
index 55093e9..afc3353 100644
--- a/wx/unpackage/dist/dev/mp-weixin/pages/addPersonnel/addPersonnel.js
+++ b/wx/unpackage/dist/dev/mp-weixin/pages/addPersonnel/addPersonnel.js
@@ -106,7 +106,10 @@
return Promise.all(/*! import() | node-modules/uview-ui/components/u-button/u-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-button/u-button")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-button/u-button.vue */ 406))
},
uPopup: function () {
- return Promise.all(/*! import() | node-modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-popup/u-popup.vue */ 485))
+ return Promise.all(/*! import() | node-modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-popup/u-popup.vue */ 492))
+ },
+ uToast: function () {
+ return __webpack_require__.e(/*! import() | node-modules/uview-ui/components/u-toast/u-toast */ "node-modules/uview-ui/components/u-toast/u-toast").then(__webpack_require__.bind(null, /*! uview-ui/components/u-toast/u-toast.vue */ 485))
},
}
} catch (e) {
@@ -333,6 +336,13 @@
//
//
//
+//
+//
+//
+//
+//
+//
+//
var _default = {
data: function data() {
return {
@@ -360,7 +370,14 @@
this.getDetails();
}
uni.$on('add', function (data) {
- _this.list.unshift(data.model);
+ if (JSON.stringify(_this.list).indexOf(data.model.idCard) !== -1) {
+ _this.$refs.uToast.show({
+ type: 'default',
+ message: "[".concat(data.model.name, "]\u4EBA\u5458\u8EAB\u4EFD\u8BC1\u91CD\u590D")
+ });
+ } else {
+ _this.list.unshift(data.model);
+ }
});
},
methods: {
--
Gitblit v1.9.3