调整转译日报的地方

fhKeeper/formulahousekeeper/timesheet/src/components/select.vue

@@ -154,6 +154,7 @@ export default {
             type: Boolean,
             default: false
         },
+        
     },
     components: {
         selectWidth: '150',
@@ -186,8 +187,8 @@ export default {
                 this.options = newValue
                 if(this.flg) {
                     if(newValue) {
-                        this.selectName = newValue[0].name || newValue[0].auditorName
-                        this.optionsOId = newValue[0].id || newValue[0].auditorId
+                        this.selectName = newValue[0].auditorName || newValue[0].name
+                        this.optionsOId = newValue[0].auditorId || newValue[0].id
                     }
                 }
             },
@@ -207,7 +208,7 @@ export default {
                 if(!this.multiSelect) {
                     if(this.optionsOId) {
                         for(let i in this.options) {
-                            if(this.options[i].id == this.optionsOId || this.options[i].auditorId == this.optionsOId) {
+                            if(this.options[i].auditorId == this.optionsOId || this.options[i].id == this.optionsOId) {
                                 this.selectName = this.options[i].name || this.options[i].auditorName
                             }
                         }
@@ -218,7 +219,7 @@ export default {
                 if(this.multiSelect) {
                     for(var i in this.options) {
                         for(var j in this.optionsOId) {
-                            if(this.options[i].id == this.optionsOId[j] || this.options[i].auditorId == this.optionsOId[j]) {
+                            if(this.options[i].auditorId == this.optionsOId[j] || this.options[i].id == this.optionsOId[j]) {
                                 this.multiSelectList.push(this.options[i])
                                 this.options[i].flg = true
                             }
@@ -258,15 +259,15 @@ export default {
             if(!this.multiSelect) {
                 this.optionsOId = JSON.parse(JSON.stringify(this.subjectId))
                 for(let i in this.options) {
-                    if(this.options[i].id == this.optionsOId || this.options[i].auditorId == this.optionsOId) {
-                        this.selectName = this.options[i].name || this.options[i].auditorName
+                    if(this.options[i].auditorId == this.optionsOId || this.options[i].id == this.optionsOId) {
+                        this.selectName = this.options[i].auditorName || this.options[i].name 
                     }
                 }
             }
             if(this.multiSelect) {
                 for(var i in this.options) {
                     for(var j in this.optionsOId) {
-                        if(this.options[i].id == this.optionsOId[j] || this.options[i].auditorId == this.optionsOId[j]) {
+                        if( this.options[i].auditorId == this.optionsOId[j] || this.options[i].id == this.optionsOId[j]) {
                             this.multiSelectList.push(this.options[i])
                             this.options[i].flg = true
                         }
@@ -358,8 +359,9 @@ export default {
             this.transitionBoxLiIdx = index
         },
         liClick(item, itemIndex) {
-            let nameId = item.id || item.auditorId
-            this.selectName = item.name || item.auditorName
+            console.log(item, '进来的')
+            let nameId = item.auditorId || item.id
+            this.selectName = item.auditorName || item.name
             if(!this.multiSelect) {
                 console.log('我进来了', this.flg)
                 if(this.flgs) {

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -6296,6 +6296,7 @@
             },
             // 自定义事件
             selectCal(obj) {
+                console.log(obj, '传数据来源')
                 if(obj.distinction == '1') {
                     this.zhoBao.projectAuditorId = obj.id
                 } else if(obj.distinction == '2') {