Browse Source

Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

seyason 1 year ago
parent
commit
a927e0dacf

+ 6 - 1
fhKeeper/formulahousekeeper/timesheet/src/components/select.vue

@@ -165,6 +165,7 @@ export default {
             selectFontSize: '12',
             show: false, // 下拉框
             options: [], // 列表数据
+            optionsCopy: [], // 列表数据复制
             transitionBoxLiIdx: '', // hover 背景色
             selectName: this.$t('defaultText.pleaseChoose'), // 显示的文字
             classDiv: false, // 获得焦点样式
@@ -186,6 +187,7 @@ export default {
         subject: {
             handler(newValue, oldValue) {
                 this.options = newValue
+                this.optionsCopy = JSON.parse(JSON.stringify(newValue))
                 if(this.flg) {
                     if(newValue) {
                         this.selectName = newValue[0].auditorName || newValue[0].name
@@ -348,6 +350,7 @@ export default {
                 this.show = !this.show
                 this.move = !this.move
                 this.searchTex = ''
+                this.$set(this, 'options', this.optionsCopy)
             }
         },
         selectClihide() {
@@ -513,7 +516,9 @@ export default {
                             return item;
                         }
                     })
-                    this.options = arr
+                    // this.options = arr
+                    console.log('将要赋值')
+                    this.$set(this, 'options', arr)
                     this.cursor = res.data.nextCursor
                 } else {
                     this.$message({

+ 1 - 0
fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -5292,6 +5292,7 @@ a {
                     for(var i in userList) {
                         arr.push(userList[i].id)
                     }
+                    this.participator = JSON.parse(JSON.stringify(this.participator))
                     this.addForm.auditUserIds = arr
                 } else if(obj.distinction == '11') {
                     let userList = obj.id