xujun

src/views/assign/components/assignDetail.vue

@@ -5,7 +5,10 @@
         <a-input placeholder="项目名称" v-model="searchForm.projName" :maxLength="100" style="width: 160px" />
       </a-form-item>
       <a-form-item>
-        <a-input placeholder="项目分组" v-model="searchForm.groupId" :maxLength="100" style="width: 160px" />
+        <a-select v-if="groupList" default-value="" placeholder="项目分组" v-model="searchForm.groupId" style="width: 160px" @change="groupChange">
+          <a-select-option v-for="item in groupList" :key="item.groupId" :value="item.groupId">{{ item.groupName }}</a-select-option>
+        </a-select>
+        <!-- <a-input placeholder="项目分组" v-model="searchForm.groupId" :maxLength="100" style="width: 160px" /> -->
       </a-form-item>
       <a-form-item>
         <base-select v-model="searchForm.assignYear" :title="'年度'" :type="8" :isAll="true" :width="160" />
@@ -74,13 +77,21 @@ import projectView from '@/views/report/project/components/projectView'
 
 export default {
   name: 'assignDetail',
+  props: {
+    groupList: {
+      type: Array,
+      default: () => {
+        return [{ groupId: "", groupName: "--请选择分组--" }]
+      }
+    },
+  },
   components: {
     baseSelect, projectView
   },
   data () {
     return {
       form: this.$form.createForm(this, { name: 'assign_search' }),
-      searchForm: { projName: null, groupId: null, assignYear: null, appUnitName: null, appPersonName: null, personName: null, auditState: "", projType: getType() },
+      searchForm: { projName: null, groupId: "", assignYear: null, appUnitName: null, appPersonName: null, personName: null, auditState: "", projType: getType() },
       tableData: [],
       columns: [
         { title: "项目名称", scopedSlots: { customRender: 'projName' }, ellipsis: true, width: 300, },
@@ -119,6 +130,7 @@ export default {
         if (data) {
           this.searchForm.assignYear = data.year
           this.getListByPage()
+          console.log(this.groupList)
         }
       }).catch(() => { })
     },
@@ -159,6 +171,9 @@ export default {
       this.pagination.pageIndex = 1
       this.getListByPage()
     },
+    groupChange(value) {
+      this.searchForm.groupId = value
+    },
     recordClick (record, type) {
       if (type === 'view') {
         this.projId = record.projId

src/views/peAssign/projKeyAssign.vue

@@ -84,7 +84,7 @@
       <assign-group-expert-view v-model="evaluationId" @close="closeAssignExpertView" />
     </a-modal>
     <a-modal v-model="assignDetailVisible" title="分配明细" width="90%" :dialog-style="{ top: '5%' }" :footer="null" destroyOnClose>
-      <assign-detail />
+      <assign-detail :groupList="groupList" />
     </a-modal>
     <a-modal v-model="projectIntoGroupVisible" :title="projectIntoGroupTitle" width="70%" :dialog-style="{ top: '15%' }" :maskClosable="false" destroyOnClose>
       <template slot="footer">
@@ -284,6 +284,11 @@ export default {
       this.groupEditVisible = true
     },
     onaAssignDetail () {
+      this.groupList = []
+      this.groupList.push({ groupId: "", groupName: "--请选择分组--" })
+      this.tableData2.forEach(e => {
+        this.groupList.push({ groupId: e.id, groupName: e.groupName })
+      })
       this.assignDetailVisible = true
     },
     closeWindow (value) {