[update] 联调企标立项、变更计划

src/components/selection/EnterprisePlanSelectionModal.vue

@@ -57,8 +57,8 @@
               <a-form-item :label="$t('enterpriseStandardLibrary.plan.revisionType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-dict-select-tag
                   :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.revisionType')"
-                  dict-code="esp_application_category"
-                  v-model="queryParam.applicationCategory">
+                  dict-code="esp_revision_type"
+                  v-model="queryParam.revisionType">
                 </j-dict-select-tag>
               </a-form-item>
             </a-col>
@@ -106,7 +106,7 @@ export default {
       required: false,
       default: 'checkbox'
     },
-    searchParam: {
+    searchParam: { // 根据不同模块传入固定的查询参数
       type: Object,
       required: false,
       default () {

src/components/selection/UserSelectByContact.vue

@@ -17,7 +17,7 @@
         {{ $t('userSelect.select') }}
       </a-button>
     </div>
-    <user-select-by-contact-modal v-bind="$attrs" :nameStr="nameStr" ref="selectModal" @change="selectChange" @nameChange="nameChange"></user-select-by-contact-modal>
+    <user-select-by-contact-modal v-bind="$attrs" :nameStr="nameStr" ref="selectModal" @change="selectChange" @listChange="listChange" @nameChange="nameChange"></user-select-by-contact-modal>
   </div>
 </template>
 
@@ -78,6 +78,9 @@ export default {
     selectChange (ids) {
       this.$emit('change', ids)
     },
+    listChange (value) {
+      this.$emit('listChange', value)
+    },
     nameChange (value) {
       this.checkedValue = value
       this.$emit('nameChange', value, this.filedName)

src/components/selection/UserSelectByContactModal.vue

@@ -12,7 +12,7 @@
         <a-row :gutter="24">
           <a-col :span="6">
             <a-form-item :label="$t('system.contact.departName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('system.contact.departName')" v-model="queryParam.departName"></a-input>
+              <j-input :placeholder="$t('pleaseEnter')+$t('system.contact.departName')" v-model="queryParam.departName"></j-input>
             </a-form-item>
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -25,7 +25,7 @@
     <div class="modal-content">
       <a-table
         :columns="columns"
-        rowKey="id"
+        rowKey="contactId"
         bordered
         :scroll="{x: '100%'}"
         :data-source="dataSource"
@@ -96,28 +96,28 @@ export default {
           title: this.$t('system.contact.departName'),
           align: 'center',
           width: 180,
-          dataIndex: 'departName',
+          dataIndex: 'departId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 标准化工程师
           title: this.$t('system.contact.standardizationEngineer'),
           align: 'center',
           width: 180,
-          dataIndex: 'standardizationEngineer',
+          dataIndex: 'engineerId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 联络人
           title: this.$t('system.contact.contactPerson'),
           align: 'center',
           width: 180,
-          dataIndex: 'contactPerson',
+          dataIndex: 'contactId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 部门联络人主管级领导
           title: this.$t('system.contact.contactPersonSupervisorLevelLeader'),
           align: 'center',
           width: 240,
-          dataIndex: 'contactPersonSupervisorLevelLeader',
+          dataIndex: 'leaderId_dictText',
           scopedSlots: { customRender: 'text' }
         }
       ],
@@ -137,7 +137,7 @@ export default {
       loadingLeft: false,
       dataSourceRight: [],
       url: {
-        userList: '',
+        userList: '/laws/system/lawsContactManage/page',
         userListByIds: '/sys/user/queryByIds'
       }
     }
@@ -244,6 +244,7 @@ export default {
     },
     handleOk () {
       this.$emit('change', this.selectedRowKeys.join(','))
+      this.$emit('listChange', this.dataSourceRight)
       this.$emit('nameChange', this.dataSourceRight.map(item => item.realname + '(' + item.username + ')').join(','))
       this.close()
     },