Merge remote-tracking branch 'origin/fix_20230524' into fix_20230524

jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue

@@ -49,12 +49,19 @@
               <a-radio value="Transfer" v-if="query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'zrrqr'">
                 {{$t('turnToDo')}}
               </a-radio>
-              <a-button type="primary" v-if="isPersonnel" @click="PersonnelSelectionClick">
+<!--              <a-button type="primary" v-if="isPersonnel" @click="PersonnelSelectionClick">-->
-                {{this.$t('PersonnelSelection')}}
+<!--                {{this.$t('PersonnelSelection')}}-->
-              </a-button>
+<!--              </a-button>-->
-              <span>
+<!--              <span>-->
-                {{this.formInline.dezrrSubmitUserName}}
+<!--                {{this.formInline.dezrrSubmitUserName}}-->
-              </span>
+<!--              </span>-->
+              <a-form-model-item class="itemModel-per">
+                <PersonnelSelection v-if="isPersonnel" :query="{db_field_name:this.query.TaskKey == 'zrrtjjfw'?'dezrrSubmitUserId':'secondChargePersonUserId',db_field_txt:$t('personnel')}"
+                                    :isSingleChoice="true"
+                                    :personneQuery="formInline"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="formInline.dezrrSubmitUserName"/>
+              </a-form-model-item>
             </a-radio-group>
           </a-form-model-item>
         </a-col>
@@ -125,6 +132,7 @@
 
 <script>
   import { getAction, postAction, putAction, deleteAction } from '@/api/manage'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
   import uploadFile from '@/components/uploadFile/file'
   import SelectedBy from '@/components/SelectedBy/index'
   import moment from 'moment'
@@ -133,6 +141,7 @@
     name: 'reviewedByThePersonInCharge',
     components: {
       uploadFile,
+      PersonnelSelection,
       SelectedBy
     },
     props: ['queryBy', 'queryPersonInCharge', 'query'],
@@ -210,6 +219,10 @@
       }
     },
     methods: {
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
       getData(data) {
         this.formInline.disposeResult = data.operatorResult
         this.formInline.approvalOpinion = data.approvalOpinion
@@ -397,4 +410,10 @@
     border: 1px #00B3BE solid;
     color: #00B3BE;
   }
+  .itemModel-per{
+    width: calc(50% - 130px) !important;
+    display: inline-block !important;
+    margin-top: -6px !important;
+    height: 40px !important;
+  }
 </style>