diff --git a/package-lock.json b/package-lock.json index 197836537..d3ff2e343 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2947,13 +2947,13 @@ }, "@vant/icons": { "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.7.1.tgz", - "integrity": "sha512-66LPEq89w4kl258nALZcRNd14eUJC8VajvTJwvZKOaZawz6CUeVZ6ybhedTUhQhRjeA8SyWD7dFt4ALf33Sabw==" + "resolved": "https://registry.nlark.com/@vant/icons/download/@vant/icons-1.7.1.tgz", + "integrity": "sha1-Sa5CAwK1WB5U5olIkeWgW8dun4c=" }, "@vant/popperjs": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@vant/popperjs/-/popperjs-1.1.0.tgz", - "integrity": "sha512-8MD1gz146awV/uPxYjz4pet22f7a9YVKqk7T+gFkWFwT9mEcrIUEg/xPrdOnWKLP9puXyYtm7oVfSDSefZ/p/w==", + "resolved": "https://registry.nlark.com/@vant/popperjs/download/@vant/popperjs-1.1.0.tgz", + "integrity": "sha1-tO3uW7+m+xhwWYbjE9T9XxeUKg8=", "requires": { "@popperjs/core": "^2.9.2" } @@ -3613,23 +3613,6 @@ "upath": "^1.1.1" } }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -4575,94 +4558,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.5.0", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz", - "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true, - "optional": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "optional": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", @@ -13579,7 +13474,7 @@ }, "vant": { "version": "2.12.36", - "resolved": "https://registry.npmjs.org/vant/-/vant-2.12.36.tgz", + "resolved": "https://registry.npmmirror.com/vant/download/vant-2.12.36.tgz", "integrity": "sha512-+/XRx0MC/fHK2gskC7BMI00Ubrh+C46HtlyBzFGYIauzbQy9IotiuBkBZh+ep15ygXxIpozmudsLlGtX1cfexw==", "requires": { "@babel/runtime": "7.x", @@ -13649,8 +13544,96 @@ }, "vue-lazyload": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.3.tgz", - "integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g==" + "resolved": "https://registry.nlark.com/vue-lazyload/download/vue-lazyload-1.2.3.tgz", + "integrity": "sha1-kB+ewVx+bKeHgaK65KNDaGve2yw=" + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.3.tgz?cache=0&sync_timestamp=1636034706501&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.8.3.tgz", + "integrity": "sha1-1D5nXe9bqTRdbH8FkUwT2GGZcIc=", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz", + "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmmirror.com/chalk/download/chalk-4.1.2.tgz", + "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz", + "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz", + "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz", + "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", + "dev": true, + "optional": true + }, + "hash-sum": { + "version": "2.0.0", + "resolved": "https://registry.nlark.com/hash-sum/download/hash-sum-2.0.0.tgz", + "integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.2", + "resolved": "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687947060&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz", + "integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmmirror.com/supports-color/download/supports-color-7.2.0.tgz", + "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } }, "vue-router": { "version": "3.4.0", diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index f5edd9808..85df5d07d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -33,7 +33,7 @@ - @@ -209,7 +209,7 @@ export default { {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, ], drafterName: [ - {required: true, message: '请输入起草人', trigger: 'blur'}, + {required: true, message: '请选择起草人', trigger: 'change'}, ], newReason: [ {required: true, message: '请输入新增原因', trigger: 'blur'}, @@ -257,8 +257,11 @@ export default { this.modalshowflag = true; }, checkedRole(data) { - this.qbfsForm.wgLeader = data[0].id; - this.qbfsForm.wgLeaderName = data[0].name; + this.$set(this.qbfsForm, 'wgLeader', data[0].id) + this.$set(this.qbfsForm, 'wgLeaderName', data[0].name) + if(this.qbfsForm.wgLeaderName){ + this.$refs.qbfsForm.validateField('wgLeaderName') + } this.modalshowflag = false; }, choiceZRRS(type) { @@ -279,10 +282,9 @@ export default { this.modalshowflag2 = true; }, checkedRole2(data) { - var idList = ""; - var nameList = ""; + let idList = "", nameList = "" data.forEach(item => { - if (nameList.length > 0) { + if (nameList.length) { nameList += ","; idList += ","; } @@ -290,11 +292,18 @@ export default { nameList += item.name; }); if(this.roleType === '1'){ - this.qbfsForm.drafter = idList; - this.qbfsForm.drafterName = nameList; + this.$set(this.qbfsForm, 'drafter', idList) + this.$set(this.qbfsForm, 'drafterName', nameList) }else if(this.roleType === '2'){ - this.qbfsForm.resPerson = idList; - this.qbfsForm.resPersonName = nameList; + this.$set(this.qbfsForm, 'resPerson', idList) + this.$set(this.qbfsForm, 'resPersonName', nameList) + } + // === '0' false null undefined都属于false类变量 如果里面有值可以直接判断 + if(this.qbfsForm.drafterName){ + this.$refs.qbfsForm.validateField('drafterName'); + } + if(this.qbfsForm.resPersonName){ + this.$refs.qbfsForm.validateField('resPersonName'); } }, validateForm () { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 168e4d9bc..b47e87d86 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -453,8 +453,11 @@ export default { this.modalshowflag = true; }, checkedRole(data) { - this.qbfsForm.wgLeader = data[0].id; - this.qbfsForm.wgLeaderName = data[0].name; + this.$set(this.qbfsForm, 'wgLeader', data[0].id) + this.$set(this.qbfsForm, 'wgLeaderName', data[0].name) + if(this.qbfsForm.wgLeaderName){ + this.$refs.qbfsForm.validateField('wgLeaderName') + } this.modalshowflag = false; }, choiceZRRS(type) { @@ -475,10 +478,10 @@ export default { this.modalshowflag2 = true; }, checkedRole2(data) { - var idList = ""; - var nameList = ""; + let idList = ""; + let nameList = ""; data.forEach(item => { - if (nameList.length > 0) { + if (nameList.length) { nameList += ","; idList += ","; } @@ -486,11 +489,17 @@ export default { nameList += item.name; }); if(this.type === '1'){ - this.qbfsForm.drafter = idList; - this.qbfsForm.drafterName = nameList; + this.$set(this.qbfsForm, 'drafter', idList) + this.$set(this.qbfsForm, 'drafterName', nameList) }else if(this.type === '2'){ - this.qbfsForm.resPerson = idList; - this.qbfsForm.resPersonName = nameList; + this.$set(this.qbfsForm, 'resPerson', idList) + this.$set(this.qbfsForm, 'resPersonName', nameList) + } + if(this.qbfsForm.drafterName){ + this.$refs.qbfsForm.validateField('drafterName'); + } + if(this.qbfsForm.resPersonName){ + this.$refs.qbfsForm.validateField('resPersonName'); } }, validateForm () { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 97ea88dac..d7c68c92d 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -115,35 +115,17 @@ - - -